[Cmake-commits] CMake branch, next, updated. v2.8.9-121-g79d2c9c

[David Cole]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  79d2c9c0e3f946bb290a7da447e9e5272d0b31bf (commit)
       via  1fc5efed3f27a7046d38e40b4c5ddfc0797cac86 (commit)
      from  6da9e9ab53459b3efd9a3e2623a01558b40387e6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79d2c9c0e3f946bb290a7da447e9e5272d0b31bf
commit 79d2c9c0e3f946bb290a7da447e9e5272d0b31bf
Merge: 6da9e9a 1fc5efe
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Aug 16 17:08:15 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 16 17:08:15 2012 -0400

    Merge topic 'make-CPACK_CYGWIN_PATCH_NUMBER-cache' into next
    
    1fc5efe Convert the CPACK_CYGWIN_PATCH_NUMBER variable to a cache variable


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1fc5efed3f27a7046d38e40b4c5ddfc0797cac86
commit 1fc5efed3f27a7046d38e40b4c5ddfc0797cac86
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Aug 16 16:40:24 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Aug 16 16:40:24 2012 -0400

    Convert the CPACK_CYGWIN_PATCH_NUMBER variable to a cache variable
    
    Makes it easy to override it, by priming the cache from a release
    build script, for example.
    
    Also: correct mistaken @@ variable references with plain ${}
    style references so that future readers do not think that it
    must be an input to configure_file...

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 at -@CPACK_CYGWIN_PATCH_NUMBER at .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 at -@CPACK_CYGWIN_PATCH_NUMBER at .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

-----------------------------------------------------------------------

Summary of changes:
 CMakeCPack.cmake |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake