[cmake-commits] hoffman committed CPack.Info.plist.in 1.4 1.4.2.1 CPack.cmake 1.17.2.7 1.17.2.8

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv9801/Modules

Modified Files:
      Tag: CMake-2-4
	CPack.Info.plist.in CPack.cmake 
Log Message:
ENH: move over mac package change


Index: CPack.Info.plist.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.Info.plist.in,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- CPack.Info.plist.in	3 Mar 2006 15:52:26 -0000	1.4
+++ CPack.Info.plist.in	28 Dec 2007 14:49:49 -0000	1.4.2.1
@@ -20,7 +20,7 @@
 <key>IFPkgFlagOverwritePermissions</key>
 <true/>
 <key>IFPkgFlagRelocatable</key>
-<false/>
+<@CPACK_PACKAGE_RELOCATABLE@/>
 <key>IFPkgFlagRestartAction</key>
 <string>NoRestart</string>
 <key>IFPkgFlagRootVolumeOnly</key>

Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.17.2.7
retrieving revision 1.17.2.8
diff -u -d -r1.17.2.7 -r1.17.2.8
--- CPack.cmake	5 Feb 2007 18:21:32 -0000	1.17.2.7
+++ CPack.cmake	28 Dec 2007 14:49:49 -0000	1.17.2.8
@@ -79,6 +79,14 @@
   "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}")
 cpack_set_if_not_set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY
   "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}")
+cpack_set_if_not_set(CPACK_PACKAGE_RELOCATABLE "true")
+
+# always force to exactly "true" or "false" for CPack.Info.plist.in:
+if(CPACK_PACKAGE_RELOCATABLE)
+  set(CPACK_PACKAGE_RELOCATABLE "true")
+else(CPACK_PACKAGE_RELOCATABLE)
+  set(CPACK_PACKAGE_RELOCATABLE "false")
+endif(CPACK_PACKAGE_RELOCATABLE)
 
 MACRO(cpack_check_file_exists file description)
 IF(NOT EXISTS "${file}")