CPACK:

* Added revision number to cpack version. 
* Fixed arch package name.

git-svn-id: http://svn.code.sf.net/p/simox/code/trunk@547 042f3d55-54a8-47e9-b7fb-15903f145c44

CMakeLists.txt

@@ -113,6 +113,18 @@ install(EXPORT SimoxTargets DESTINATION
 #############################################################
 # PACKAGING (DEB)
 
+FIND_PACKAGE(Subversion)
+IF(Subversion_FOUND)
+    Subversion_WC_INFO(${CMAKE_HOME_DIRECTORY} Project)
+    MESSAGE("Current revision is ${Project_WC_REVISION}")
+ENDIF(Subversion_FOUND)
+
+IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+    SET(CPACK_DEBIAN_ARCHITECTURE "amd64")
+ELSE()
+    SET(CPACK_DEBIAN_ARCHITECTURE "i386")
+ENDIF()
+
 INCLUDE(InstallRequiredSystemLibraries)
 SET(CPACK_SET_DESTDIR "on")
 SET(CPACK_PACKAGING_INSTALL_PREFIX "/tmp")
@@ -124,14 +136,14 @@ SET(CPACK_PACKAGE_VENDOR "KIT")
 SET(CPACK_PACKAGE_CONTACT "Nikolaus Vahrenkamp, <vahrenkamp at kit dot edu>")
 SET(CPACK_PACKAGE_VERSION_MAJOR "${Simox_MAJOR_VERSION}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${Simox_MINOR_VERSION}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${Simox_PATCH_VERSION}")
-SET(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${Simox_MAJOR_VERSION}.${Simox_MINOR_VERSION}.${Simox_PATCH_VERSION}")
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${Simox_MAJOR_VERSION}.${Simox_MINOR_VERSION}.${Simox_PATCH_VERSION}")
+SET(CPACK_PACKAGE_VERSION_PATCH "${Simox_PATCH_VERSION}-r${Project_WC_REVISION}")
+SET(CPACK_PACKAGE_FILE_NAME "simox_${Simox_MAJOR_VERSION}.${Simox_MINOR_VERSION}.${Simox_PATCH_VERSION}-r${Project_WC_REVISION}_${CPACK_DEBIAN_ARCHITECTURE}")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "simox_${Simox_MAJOR_VERSION}.${Simox_MINOR_VERSION}.${Simox_PATCH_VERSION}-r${Project_WC_REVISION}")
 
+# Debian specific
 #SET(CPACK_DEBIAN_PACKAGE_DEPENDS "kdebase-runtime (>= 4:4.2.1), kdelibs5 (>= 4:4.2.1), libc6 (>= 2.1.3), libgcc1 (>= 1:4.1.1), libplasma3, libqt4-dbus (>= 4.5.0), libqtcore4 (>= 4.5.0), libqtgui4 (>= 4.5.0), libstdc++6 (>= 4.2.1)")
 #SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
 #SET(CPACK_DEBIAN_PACKAGE_SECTION "kde")
-SET(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
 
 #GET_PROPERTY(result GLOBAL ENABLED_FEATURES)
 #message(" enabled features: ${result}")