[cmake-commits] hoffman committed CMakeCPack.cmake 1.9 1.10 CMakeCPackOptions.cmake.in 1.1 1.2

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeCPack.cmake CMakeCPackOptions.cmake.in 
Log Message:
ENH: change CPACK_CREATE_DESKTOP_LINKS to something that can handle spaces in the name of the exectuable


Index: CMakeCPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeCPack.cmake,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- CMakeCPack.cmake	31 Oct 2007 16:55:04 -0000	1.9
+++ CMakeCPack.cmake	7 Nov 2007 18:11:58 -0000	1.10
@@ -2,7 +2,10 @@
 IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
   IF(EXISTS "${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake")
     SET(CMAKE_INSTALL_MFC_LIBRARIES 1)
-    INCLUDE(InstallRequiredSystemLibraries)
+    OPTION(CMAKE_INSTALL_DEBUG_LIBRARIES 
+      "Install Microsoft runtime debug libraries with CMake." FALSE)
+    MARK_AS_ADVANCED(CMAKE_INSTALL_DEBUG_LIBRARIES)
+    INCLUDE(${CMake_SOURCE_DIR}/Modules/InstallRequiredSystemLibraries.cmake)
   ENDIF(EXISTS "${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake")
   CONFIGURE_FILE("${CMake_SOURCE_DIR}/CMakeCPackOptions.cmake.in"
     "${CMake_BINARY_DIR}/CMakeCPackOptions.cmake" @ONLY)

Index: CMakeCPackOptions.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeCPackOptions.cmake.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CMakeCPackOptions.cmake.in	31 Oct 2007 16:55:04 -0000	1.1
+++ CMakeCPackOptions.cmake.in	7 Nov 2007 18:11:58 -0000	1.2
@@ -20,7 +20,7 @@
   # tell cpack the executables you want in the start menu as links
   SET(CPACK_PACKAGE_EXECUTABLES "CMakeSetup" "CMake" )
   # tell cpack to create a desktop link to CMakeSetup
-  SET(CPACK_CREATE_DESKTOP_LINK_CMakeSetup ON)
+  SET(CPACK_CREATE_DESKTOP_LINKS "CMakeSetup")
   SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\CMakeSetup.exe")
   SET(CPACK_NSIS_DISPLAY_NAME "@CPACK_PACKAGE_INSTALL_DIRECTORY@ a cross-platform, open-source build system")
   SET(CPACK_NSIS_HELP_LINK "http:\\\\www.cmake.org")