[Cmake-commits] CMake branch, next, updated. v3.2.1-1247-gdf5c75d

[Clinton Stimpson]

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  df5c75d49d76488736841fe6e3bde1f4d85b0ece (commit)
       via  798582d0018ee501e0091d4ae1315d3d1b000ca2 (commit)
      from  adfa97275e880a785d9611a60af9df9591fe4af0 (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=df5c75d49d76488736841fe6e3bde1f4d85b0ece
commit df5c75d49d76488736841fe6e3bde1f4d85b0ece
Merge: adfa972 798582d
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Mar 27 00:15:37 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 27 00:15:37 2015 -0400

    Merge topic 'cpack-archive-prefix' into next
    
    798582d0 Fix CPackComponentsPrefix test failure without NSIS.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=798582d0018ee501e0091d4ae1315d3d1b000ca2
commit 798582d0018ee501e0091d4ae1315d3d1b000ca2
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Mar 26 22:14:07 2015 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Mar 26 22:14:07 2015 -0600

    Fix CPackComponentsPrefix test failure without NSIS.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7135f5d..b47ea1b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1041,9 +1041,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     if(APPLE)
       set(CPackComponents_BUILD_OPTIONS -DCPACK_BINARY_DRAGNDROP:BOOL=ON)
     endif()
-    if(NSIS_MAKENSIS_EXECUTABLE)
+    if(NOT NSIS_MAKENSIS_EXECUTABLE)
       set(CPackComponents_BUILD_OPTIONS ${CPackComponents_BUILD_OPTIONS}
-        -DCPACK_BINARY_NSIS:BOOL=ON)
+        -DCPACK_BINARY_NSIS:BOOL=OFF)
     endif()
 
     add_test(CPackComponentsPrefix ${CMAKE_CTEST_COMMAND}

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

Summary of changes:
 Tests/CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake