[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Andi Fischer]

SVN commit 1240743 by fischer:

Does not compile when package subversion is missing - quick fix to compile again.

 M  +12 -12    CMakeLists.txt  
 M  +8 -4      version.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/CMakeLists.txt #1240742:1240743
@@ -4,18 +4,18 @@
 add_definitions(-DQT3_SUPPORT_WARNINGS)
 
 # Get subversion revision number
-find_package(Subversion)
-if(Subversion_FOUND)
-    # extract working copy information for SOURCE_DIR into MY_XXX variables
-    Subversion_WC_INFO(${CMAKE_CURRENT_SOURCE_DIR} MY)
-    set(SUBVERSION_REVISION ${MY_WC_REVISION})
-    MESSAGE(STATUS "\n-- SVN Revision: ${MY_WC_REVISION}\n")
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/revision.h.in ${CMAKE_CURRENT_BINARY_DIR}/revision.temp)
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                    ${CMAKE_CURRENT_BINARY_DIR}/revision.temp ${CMAKE_CURRENT_BINARY_DIR}/revision.h
-                    COMMAND touch ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
-    file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/revision.temp)
-endif(Subversion_FOUND)
+# find_package(Subversion)
+# if(Subversion_FOUND)
+#     # extract working copy information for SOURCE_DIR into MY_XXX variables
+#     Subversion_WC_INFO(${CMAKE_CURRENT_SOURCE_DIR} MY)
+#     set(SUBVERSION_REVISION ${MY_WC_REVISION})
+#     MESSAGE(STATUS "\n-- SVN Revision: ${MY_WC_REVISION}\n")
+#     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/revision.h.in ${CMAKE_CURRENT_BINARY_DIR}/revision.temp)
+#     execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
+#                     ${CMAKE_CURRENT_BINARY_DIR}/revision.temp ${CMAKE_CURRENT_BINARY_DIR}/revision.h
+#                     COMMAND touch ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp)
+#     file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/revision.temp)
+# endif(Subversion_FOUND)
 
 # Some definitions for experimental code or debugging
 #add_definitions(-DWANT_LVTOOLTIP)                # umllistiew
--- trunk/KDE/kdesdk/umbrello/umbrello/version.h #1240742:1240743
@@ -11,17 +11,21 @@
 #ifndef UMBRELLO_VERSION_H
 #define UMBRELLO_VERSION_H
 
-#include "revision.h"
+//#include "revision.h"
 
 #include <kdeversion.h>
 
 inline QByteArray umbrelloVersion()
 {
-    return QString("%1.%2.%3-r%4")
+//    return QString("%1.%2.%3-r%4")
+//        .arg(KDE::versionMajor()-2)
+//        .arg(KDE::versionMinor())
+//        .arg(KDE::versionRelease())
+//        .arg(REVISION).toLatin1();
+    return QString("%1.%2.%3")
         .arg(KDE::versionMajor()-2)
         .arg(KDE::versionMinor())
-        .arg(KDE::versionRelease())
-        .arg(REVISION).toLatin1();
+        .arg(KDE::versionRelease()).toLatin1();
 }
 
 #endif