[cmake-commits] hoffman committed CMakeCPack.cmake 1.7 1.8
CPackConfig.cmake.in NONE 1.1 CPackSourceConfig.cmake.in NONE 1.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Oct 30 23:02:46 EDT 2007
Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv25327
Modified Files:
CMakeCPack.cmake
Added Files:
CPackConfig.cmake.in CPackSourceConfig.cmake.in
Log Message:
ENH: cpack changes, remove the escape variable stuff as it is not needed if you provide a config file for cpack
Index: CMakeCPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeCPack.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CMakeCPack.cmake 30 Oct 2007 14:16:24 -0000 1.7
+++ CMakeCPack.cmake 31 Oct 2007 03:02:41 -0000 1.8
@@ -37,60 +37,13 @@
SET(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${CPACK_SYSTEM_NAME}")
ENDIF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
SET(CPACK_PACKAGE_CONTACT "cmake at cmake.org")
- IF(WIN32 AND NOT UNIX)
- # set the install/unistall icon used for the installer itself
- SET(CPACK_NSIS_MUI_ICON "${CMake_SOURCE_DIR}/Utilities/Release\\CMakeLogo.ico")
- SET(CPACK_NSIS_MUI_UNIICON "${CMake_SOURCE_DIR}/Utilities/Release\\CMakeLogo.ico")
- # There is a bug in NSI that does not handle full unix paths properly. Make
- # sure there is at least one set of four (4) backlasshes.
- SET(CPACK_PACKAGE_ICON "${CMake_SOURCE_DIR}/Utilities/Release\\CMakeInstall.bmp")
- # 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)
- # These variables should have escapes preserved during the
- # translation to the CPackConfig.cmake file. By default,
- # CPack will require double escapes as it gets parsed by
- # cmake twice
- SET(CPACK_ESCAPE_VARIABLES
- CPACK_PACKAGE_ICON
- CPACK_NSIS_MUI_ICON
- CPACK_NSIS_MUI_UNIICON
- )
- # tell cpack to create links to the doc files
- SET(CPACK_NSIS_MENU_LINKS
- "doc/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}/CMakeSetup.html" "CMakeSetup Help"
- "doc/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}/cmake.html" "CMake Help"
- "doc/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}/cmake-properties.html"
- "CMake Properties and Variables Help"
- "doc/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}/ctest.html" "CTest Help"
- "doc/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}/cmake-modules.html" "CMake Modules Help"
- "doc/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}/cmake-commands.html" "CMake Commands Help"
- "doc/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}/cpack.html" "CPack Help"
- "http://www.cmake.org" "CMake Web Site"
-)
- 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)
- ELSE(WIN32 AND NOT UNIX)
+ IF(UNIX)
SET(CPACK_STRIP_FILES "bin/ccmake;bin/cmake;bin/cpack;bin/ctest")
SET(CPACK_SOURCE_STRIP_FILES "")
SET(CPACK_PACKAGE_EXECUTABLES "ccmake" "CMake")
- ENDIF(WIN32 AND NOT UNIX)
+ ENDIF(UNIX)
# cygwin specific packaging stuff
IF(CYGWIN)
- SET(CPACK_PACKAGE_NAME cmake)
- # setup the name of the package for cygwin cmake-2.4.3
- SET(CPACK_PACKAGE_FILE_NAME
- "${CPACK_PACKAGE_NAME}-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
- # the source has the same name as the binary
- SET(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME})
- # Create a cygwin version number in case there are changes for cygwin
- # that are not reflected upstream in CMake
- SET(CPACK_CYGWIN_PATCH_NUMBER 1)
# if we are on cygwin and have cpack, then force the
# doc, data and man dirs to conform to cygwin style directories
SET(CMAKE_DOC_DIR "/share/doc/${CPACK_PACKAGE_FILE_NAME}")
@@ -101,17 +54,27 @@
MESSAGE(STATUS "Override cache CMAKE_DOC_DIR = ${CMAKE_DOC_DIR}")
MESSAGE(STATUS "Override cache CMAKE_DATA_DIR = ${CMAKE_DATA_DIR}")
MESSAGE(STATUS "Override cache CMAKE_MAN_DIR = ${CMAKE_MAN_DIR}")
+
+ # setup the cygwin package name
+ SET(CPACK_PACKAGE_NAME cmake)
+ # setup the name of the package for cygwin cmake-2.4.3
+ SET(CPACK_PACKAGE_FILE_NAME
+ "${CPACK_PACKAGE_NAME}-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+ # the source has the same name as the binary
+ SET(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME})
+ # Create a cygwin version number in case there are changes for cygwin
+ # that are not reflected upstream in CMake
+ SET(CPACK_CYGWIN_PATCH_NUMBER 1)
# These files are required by the cmCPackCygwinSourceGenerator and the files
# put into the release tar files.
SET(CPACK_CYGWIN_BUILD_SCRIPT
"${CMake_BINARY_DIR}/@CPACK_PACKAGE_FILE_NAME at -@CPACK_CYGWIN_PATCH_NUMBER at .sh")
SET(CPACK_CYGWIN_PATCH_FILE
"${CMake_BINARY_DIR}/@CPACK_PACKAGE_FILE_NAME at -@CPACK_CYGWIN_PATCH_NUMBER at .patch")
- # include the sub directory for cygwin releases
+ # include the sub directory cmake file for cygwin that
+ # configures some files and adds some install targets
+ # this file uses some of the package file name variables
INCLUDE(Utilities/Release/Cygwin/CMakeLists.txt)
- # when packaging source make sure the .build directory is not included
- SET(CPACK_SOURCE_IGNORE_FILES
- "/CVS/" "/\\\\.build/" "/\\\\.svn/" "\\\\.swp$" "\\\\.#" "/#" "~$")
ENDIF(CYGWIN)
# include CPack model once all variables are set
INCLUDE(CPack)
--- NEW FILE: CPackConfig.cmake.in ---
# all CPACK_ variables from the cmake project
@_CPACK_OTHER_VARIABLES_@
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")
--- NEW FILE: CPackSourceConfig.cmake.in ---
# All CPACK_ variables from the cmake project
@_CPACK_OTHER_VARIABLES_@
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")
More information about the Cmake-commits
mailing list