[vlmc-devel] commit: Automatically set architecture, force package name and install prefix (Rohit Yadav )

[git at videolan.org]

vlmc | branch: master | Rohit Yadav <rohityadav89 at gmail.com> | Tue Jun  8 17:06:15 2010 +0200| [da23b2d0528229711f09b9ecb2ae3a34093edd7f] | committer: Hugo Beauzée-Luyssen 

Automatically set architecture, force package name and install prefix

Signed-off-by: Hugo Beauzée-Luyssen <beauze.h at gmail.com>

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=da23b2d0528229711f09b9ecb2ae3a34093edd7f
---

 CMakeLists.txt |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfbc1f4..e248c24 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,7 @@ ENDIF(WIN32)
 
 IF (UNIX)
     SET(WITH_PROFILING FALSE CACHE BOOL "Build with profiling support" )
+    SET(CMAKE_INSTALL_PREFIX /usr)
 ENDIF(UNIX)
 
 SET(WITH_GUI TRUE CACHE BOOL "Enable the VLMC's GUI")
@@ -158,6 +159,8 @@ INCLUDE(InstallRequiredSystemLibraries)
 SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
 SET(CPACK_PACKAGE_NAME ${PROJECT_NAME_SHORT})
 SET(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
+# Force package name
+SET(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME})
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "VideoLan Movie Creator")
 SET(CPACK_PACKAGE_DESCRIPTION 
 "VLMC \n VideoLAN Movie Creator is a cross-platform, non-linear video editing software based on the VLC Media Player.")
@@ -195,9 +198,6 @@ INCLUDE ( ${CMAKE_MODULE_PATH}/DpkgBuild.cmake )
 IF ( DPKG_FOUND )
     SET(CPACK_GENERATOR "DEB")
     SET(CPACK_SET_DESTDIR TRUE)
-    SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
-    SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
-    SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386) #change to your architecture here
     # FIXME: Check stuff: libvlc2 etc. in future as VLC 1.1+ releases
     SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt4-gui ( >= 4.6 ), libqt4-network ( >= 4.6 ), libqt4-svg ( >= 4.6 ), libqt4-xml ( >= 4.6 )")
 ENDIF ( DPKG_FOUND )
@@ -205,7 +205,6 @@ ENDIF ( DPKG_FOUND )
 #Mac
 IF( APPLE )
     SET(CPACK_GENERATOR "DragNDrop")
-    SET(CPACK_PACKAGE_FILE_NAME "VLMC")
 
     #Libraries are bundled directly
     SET(CPACK_COMPONENT_LIBRARIES_HIDDEN TRUE)