[certi-cvs] certi CMakeLists.txt

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/11/11 15:41:32

Modified files:
        .              : CMakeLists.txt 

Log message:
        Try to handling generated package name in a better way
          - with makefile generator we can know Debug/Release
            at configure time
          - whereas with Visual Studio (or any multi-config IDE) we can't

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.89&r2=1.90

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- CMakeLists.txt      11 Nov 2010 12:42:22 -0000      1.89
+++ CMakeLists.txt      11 Nov 2010 15:41:32 -0000      1.90
@@ -383,9 +383,7 @@
 
     # If this is a debug build
     # we should include debug runtime libs too
-    IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
         SET(CMAKE_INSTALL_DEBUG_LIBRARIES "Yes")
-    ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
     # Install Runtime Libraries
     INCLUDE(InstallRequiredSystemLibraries)
     
@@ -428,7 +426,7 @@
   # Try to build a relocatable package (for CPackRPM)
   SET(CPACK_RPM_PACKAGE_RELOCATABLE TRUE)
   SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP")
-  SET(CPACK_GENERATOR "TGZ;ZIP;RPM")
+  SET(CPACK_GENERATOR "TGZ;RPM;DEB")
 ENDIF (WIN32)
 
 include(SystemSpecificInformations)
@@ -451,7 +449,11 @@
 SET(CPACK_PACKAGE_VERSION_MINOR ${PACKAGE_VERSION_MINOR})
 SET(CPACK_PACKAGE_VERSION_PATCH ${PACKAGE_VERSION_PATCH})
 #SET(CPACK_PACKAGE_CONTACT "address@hidden")
-SET(CPACK_PACKAGE_FILE_NAME 
"${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_BUILD_TYPE}-${CPACK_SYSTEM_NAME}")
+IF (MSVC)
+  SET(CPACK_PACKAGE_FILE_NAME 
"${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_CFG_INTDIR}-${CPACK_SYSTEM_NAME}")
+ELSE(MSVC)
+  SET(CPACK_PACKAGE_FILE_NAME 
"${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_BUILD_TYPE}-${CPACK_SYSTEM_NAME}")
+ENDIF(MSVC)
 
 INCLUDE(CPack)
 INCLUDE(UsePackageBackup)