[certi-cvs] certi CMakeLists.txt CERTICPackOptions.cmake.in...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/11/11 17:13:35

Modified files:
        .              : CMakeLists.txt 
Added files:
        .              : CERTICPackOptions.cmake.in 
        scripts        : GeneratePackageType.cmake PackageType.cmake.in 

Log message:
        Add some CMake script in order to ease the build of different package 
types.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/certi/CERTICPackOptions.cmake.in?cvsroot=certi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/GeneratePackageType.cmake?cvsroot=certi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/PackageType.cmake.in?cvsroot=certi&rev=1.1

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- CMakeLists.txt      11 Nov 2010 15:41:32 -0000      1.90
+++ CMakeLists.txt      11 Nov 2010 17:13:35 -0000      1.91
@@ -371,6 +371,14 @@
 SET(CPACK_PACKAGE_NAME "${PACKAGE_NAME}")
 SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
 
+# Handle CPack-generator specific configuration
+ADD_CUSTOM_TARGET(PACKAGE_TYPE
+                 COMMAND ${CMAKE_COMMAND} -DSRCDIR="${CERTI_SOURCE_DIR}" 
-DDSTDIR="${CERTI_BINARY_DIR}" -DMSVC=${MSVC} 
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CFG_INTDIR=${CMAKE_CFG_INTDIR} 
-P ${CERTI_SOURCE_DIR}/scripts/GeneratePackageType.cmake)
+                  
+CONFIGURE_FILE("${CERTI_SOURCE_DIR}/CERTICPackOptions.cmake.in"
+               "${CERTI_BINARY_DIR}/CERTICPackOptions.cmake" @ONLY)
+SET(CPACK_PROJECT_CONFIG_FILE "${CERTI_BINARY_DIR}/CERTICPackOptions.cmake")
+
 IF (WIN32)
     SET(CPACK_SOURCE_GENERATOR "ZIP")
     SET(CPACK_GENERATOR "NSIS;ZIP")
@@ -449,11 +457,6 @@
 SET(CPACK_PACKAGE_VERSION_MINOR ${PACKAGE_VERSION_MINOR})
 SET(CPACK_PACKAGE_VERSION_PATCH ${PACKAGE_VERSION_PATCH})
 #SET(CPACK_PACKAGE_CONTACT "address@hidden")
-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)

Index: CERTICPackOptions.cmake.in
===================================================================
RCS file: CERTICPackOptions.cmake.in
diff -N CERTICPackOptions.cmake.in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ CERTICPackOptions.cmake.in  11 Nov 2010 17:13:35 -0000      1.1
@@ -0,0 +1,11 @@
+if (@MSVC@)
+  # FIXME We have to find way to evaluate CMAKE_CFG_INTDIR at cpack time
+  # or generate this current file at build time
+  # message("CMAKE_CFG_INTDIR=${CMAKE_CFG_INTDIR}")
+  set(PACKAGE_TYPE "NotSet")
+  include(@CERTI_BINARY_DIR@/PackageType.cmake OPTIONAL)
+  set(CPACK_PACKAGE_FILE_NAME 
"${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${PACKAGE_TYPE}-${CPACK_SYSTEM_NAME}")
+else(@MSVC@)
+  set(CPACK_PACKAGE_FILE_NAME "address@hidden@-${CPACK_SYSTEM_NAME}")
+endif(@MSVC@)
+

Index: scripts/GeneratePackageType.cmake
===================================================================
RCS file: scripts/GeneratePackageType.cmake
diff -N scripts/GeneratePackageType.cmake
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ scripts/GeneratePackageType.cmake   11 Nov 2010 17:13:35 -0000      1.1
@@ -0,0 +1,3 @@
+
+configure_file("${SRCDIR}/scripts/PackageType.cmake.in"
+              "${DSTDIR}/PackageType.cmake" @ONLY)

Index: scripts/PackageType.cmake.in
===================================================================
RCS file: scripts/PackageType.cmake.in
diff -N scripts/PackageType.cmake.in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ scripts/PackageType.cmake.in        11 Nov 2010 17:13:35 -0000      1.1
@@ -0,0 +1,6 @@
+
+if(@MSVC@)
+   get_filename_component(PACKAGE_TYPE "@CMAKE_CFG_INTDIR@" NAME)
+else(@MSVC@)
+   set(PACKAGE_TYPE "@CMAKE_BUILD_TYPE@")
+endif(@MSVC@)