diff options
| author | David Cole <david.cole@kitware.com> | 2012-08-20 19:40:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-20 19:40:45 (GMT) |
| commit | 690dbc31798e1448c94a6e3fc9058c73a8d7e32e (patch) | |
| tree | ca5b7d1ab9ac362d5ce5bfbbebc33b630d990958 | |
| parent | 1239b4881d95a31301c651e2d422a100eeb5743b (diff) | |
| parent | 1fc5efed3f27a7046d38e40b4c5ddfc0797cac86 (diff) | |
| download | CMake-690dbc31798e1448c94a6e3fc9058c73a8d7e32e.zip CMake-690dbc31798e1448c94a6e3fc9058c73a8d7e32e.tar.gz CMake-690dbc31798e1448c94a6e3fc9058c73a8d7e32e.tar.bz2 | |
Merge topic 'make-CPACK_CYGWIN_PATCH_NUMBER-cache'
1fc5efe Convert the CPACK_CYGWIN_PATCH_NUMBER variable to a cache variable
| -rw-r--r-- | CMakeCPack.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake index 480fc62..a27d000 100644 --- a/CMakeCPack.cmake +++ b/CMakeCPack.cmake @@ -99,13 +99,14 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") 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) + set(CPACK_CYGWIN_PATCH_NUMBER 1 CACHE STRING "patch number for CMake cygwin packages") + mark_as_advanced(CPACK_CYGWIN_PATCH_NUMBER) # 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@-@CPACK_CYGWIN_PATCH_NUMBER@.sh") + "${CMake_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}-${CPACK_CYGWIN_PATCH_NUMBER}.sh") set(CPACK_CYGWIN_PATCH_FILE - "${CMake_BINARY_DIR}/@CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@.patch") + "${CMake_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}-${CPACK_CYGWIN_PATCH_NUMBER}.patch") # 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 |