[Cmake-commits] CMake branch, next, updated. v2.8.7-3322-g31accb3

Eric Noulard eric.noulard at gmail.com
Tue Mar 20 17:44:01 EDT 2012


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  31accb307a7a6c76184468859062b6376b67323f (commit)
       via  87d5f1f1a69a1bed94e65a5dd1fdfe2f05eaa772 (commit)
      from  407d2b73fa3de19590943d025cec93ad7d352b6c (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=31accb307a7a6c76184468859062b6376b67323f
commit 31accb307a7a6c76184468859062b6376b67323f
Merge: 407d2b7 87d5f1f
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Tue Mar 20 17:44:00 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 20 17:44:00 2012 -0400

    Merge topic 'CPackNSIS-fixMODIFY_PATH' into next
    
    87d5f1f CPackNSIS merge patch from bug #13055.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87d5f1f1a69a1bed94e65a5dd1fdfe2f05eaa772
commit 87d5f1f1a69a1bed94e65a5dd1fdfe2f05eaa772
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Tue Mar 20 22:41:10 2012 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Tue Mar 20 22:41:10 2012 +0100

    CPackNSIS merge patch from bug #13055.

diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 571770e..e1ceed9 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -342,7 +342,7 @@ cpack_set_if_not_set(CPACK_RESOURCE_FILE_WELCOME
 cpack_set_if_not_set(CPACK_MODULE_PATH "${CMAKE_MODULE_PATH}")
 
 IF(CPACK_NSIS_MODIFY_PATH)
-  SET(CPACK_NSIS_MODIFY_PATH ON)
+  SET(CPACK_NSIS_MODIFY_PATH "ON")
 ENDIF(CPACK_NSIS_MODIFY_PATH)
 
 SET(__cpack_system_name ${CMAKE_SYSTEM_NAME})

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

Summary of changes:
 Modules/CPack.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list