[cmake-commits] david.cole committed CPack.Info.plist.in 1.4 1.5 CPack.cmake 1.34 1.35

[cmake-commits at cmake.org]

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

Modified Files:
	CPack.Info.plist.in CPack.cmake 
Log Message:
ENH: Give Mac installers package relocation capability. Default location is still the same for backwards compatibility, but packages will now be relocatable by default like they are on Windows via the NSIS installer. New CPack variables for controlling this functionality are CPACK_PACKAGE_DEFAULT_LOCATION and CPACK_PACKAGE_RELOCATABLE.


Index: CPack.Info.plist.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.Info.plist.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CPack.Info.plist.in	3 Mar 2006 15:52:26 -0000	1.4
+++ CPack.Info.plist.in	26 Dec 2007 21:57:13 -0000	1.5
@@ -12,7 +12,7 @@
 <key>IFPkgFlagAuthorizationAction</key>
 <string>AdminAuthorization</string>
 <key>IFPkgFlagDefaultLocation</key>
-<string>/</string>
+<string>@CPACK_PACKAGE_DEFAULT_LOCATION@</string>
 <key>IFPkgFlagInstallFat</key>
 <false/>
 <key>IFPkgFlagIsRequired</key>
@@ -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.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- CPack.cmake	31 Oct 2007 12:50:16 -0000	1.34
+++ CPack.cmake	26 Dec 2007 21:57:13 -0000	1.35
@@ -78,6 +78,15 @@
   "${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_DEFAULT_LOCATION "/")
+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}")