[cmake-commits] hoffman committed CMakeCPack.cmake 1.8 1.9 CMakeCPackOptions.cmake.in NONE 1.1 CPackConfig.cmake.in 1.1 NONE CPackSourceConfig.cmake.in 1.1 NONE

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeCPack.cmake 
Added Files:
	CMakeCPackOptions.cmake.in 
Removed Files:
	CPackConfig.cmake.in CPackSourceConfig.cmake.in 
Log Message:
ENH: add CPACK_PROJECT_CONFIG_FILE option to CPack


Index: CMakeCPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeCPack.cmake,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CMakeCPack.cmake	31 Oct 2007 03:02:41 -0000	1.8
+++ CMakeCPack.cmake	31 Oct 2007 16:55:04 -0000	1.9
@@ -4,6 +4,9 @@
     SET(CMAKE_INSTALL_MFC_LIBRARIES 1)
     INCLUDE(InstallRequiredSystemLibraries)
   ENDIF(EXISTS "${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake")
+  CONFIGURE_FILE("${CMake_SOURCE_DIR}/CMakeCPackOptions.cmake.in"
+    "${CMake_BINARY_DIR}/CMakeCPackOptions.cmake" @ONLY)
+  SET(CPACK_PROJECT_CONFIG_FILE "${CMake_BINARY_DIR}/CMakeCPackOptions.cmake")
   SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CMake is a build tool")
   SET(CPACK_PACKAGE_VENDOR "Kitware")
   SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt")

--- CPackConfig.cmake.in DELETED ---

--- NEW FILE: CMakeCPackOptions.cmake.in ---
if(CPACK_GENERATOR MATCHES "NSIS")
  # set the install/unistall icon used for the installer itself
  # There is a bug in NSI that does not handle full unix paths properly. 
  SET(CPACK_NSIS_MUI_ICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeLogo.ico")
  SET(CPACK_NSIS_MUI_UNIICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeLogo.ico")
  # set the package header icon for MUI
  SET(CPACK_PACKAGE_ICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeInstall.bmp")
  # tell cpack to create links to the doc files
  SET(CPACK_NSIS_MENU_LINKS
    "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/CMakeSetup.html" "CMakeSetup Help"
    "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cmake.html" "CMake Help"
    "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cmake-properties.html"
    "CMake Properties and Variables Help"
    "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/ctest.html" "CTest Help"
    "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cmake-modules.html" "CMake Modules Help"
    "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cmake-commands.html" "CMake Commands Help"
    "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cpack.html" "CPack Help"
    "http://www.cmake.org" "CMake Web Site"
    )
  # 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_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")
  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\www.kitware.com")
  SET(CPACK_NSIS_CONTACT @CPACK_PACKAGE_CONTACT@)
  SET(CPACK_NSIS_MODIFY_PATH ON)
endif(CPACK_GENERATOR MATCHES "NSIS")

if(CPACK_GENERATOR MATCHES "CygwinSource")
  # when packaging source make sure the .build directory is not included
    SET(CPACK_SOURCE_IGNORE_FILES
      "/CVS/" "/\\.build/" "/\\.svn/" "\\.swp$" "\\.#" "/#" "~$")
endif(CPACK_GENERATOR MATCHES "CygwinSource")

--- CPackSourceConfig.cmake.in DELETED ---