[Cmake-commits] CMake branch, next, updated. v2.8.7-3412-g62bd23f

[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  62bd23f62b63af432ce7c97db6d2c4f75a56c68f (commit)
       via  170ba7191dd06f4d687228f013c909a3e1835f5f (commit)
      from  d2c9c8527d648f52d0e6c213f450f8dd8d8cf0c6 (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=62bd23f62b63af432ce7c97db6d2c4f75a56c68f
commit 62bd23f62b63af432ce7c97db6d2c4f75a56c68f
Merge: d2c9c85 170ba71
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Apr 6 10:26:06 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 6 10:26:06 2012 -0400

    Merge topic 'CPackNSIS-fixMODIFY_PATH' into next
    
    170ba71 Revert "CPackNSIS merge patch from bug #13055."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=170ba7191dd06f4d687228f013c909a3e1835f5f
commit 170ba7191dd06f4d687228f013c909a3e1835f5f
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Apr 6 10:22:46 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Apr 6 10:23:47 2012 -0400

    Revert "CPackNSIS merge patch from bug #13055."
    
    This reverts commit 87d5f1f1a69a1bed94e65a5dd1fdfe2f05eaa772.
    
    The commit was essentially a no-op. The double quotes do not make
    a relevant difference here...

diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index e1ceed9..571770e 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