[Cmake-commits] CMake branch, next, updated. v3.3.2-3258-g4dffb6a

[Brad King]

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  4dffb6af919b9e3de64f84b7da05fe64a369dff9 (commit)
       via  d1912e51ceb55ae0b847e045dbd1f277b1fff42d (commit)
      from  d255a9c0e5d915230608ecc333787c133cbdb264 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4dffb6af919b9e3de64f84b7da05fe64a369dff9
commit 4dffb6af919b9e3de64f84b7da05fe64a369dff9
Merge: d255a9c d1912e5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 25 09:32:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 25 09:32:48 2015 -0400

    Merge topic 'genex-SHELL_PATH' into next
    
    d1912e51 fixup! Genex: Add a SHELL_PATH expression


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1912e51ceb55ae0b847e045dbd1f277b1fff42d
commit d1912e51ceb55ae0b847e045dbd1f277b1fff42d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 25 09:20:39 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 25 09:25:32 2015 -0400

    fixup! Genex: Add a SHELL_PATH expression

diff --git a/Tests/GeneratorExpression/CMakeLists.txt b/Tests/GeneratorExpression/CMakeLists.txt
index 79571f3..27f33a2 100644
--- a/Tests/GeneratorExpression/CMakeLists.txt
+++ b/Tests/GeneratorExpression/CMakeLists.txt
@@ -239,7 +239,7 @@ add_custom_target(check-part4 ALL
     -Dtest_shell_path=${path_prefix}$<SHELL_PATH:${test_shell_path}>
     -Dpath_prefix=${path_prefix}
     -DWIN32=${WIN32}
-    -DMSYS=${MSYS}
+    -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
     -P ${CMAKE_CURRENT_SOURCE_DIR}/check-part4.cmake
   COMMAND ${CMAKE_COMMAND} -E echo "check done (part 4 of 4)"
   VERBATIM
diff --git a/Tests/GeneratorExpression/check-part4.cmake b/Tests/GeneratorExpression/check-part4.cmake
index 8a5e71a..9e516d5 100644
--- a/Tests/GeneratorExpression/check-part4.cmake
+++ b/Tests/GeneratorExpression/check-part4.cmake
@@ -2,10 +2,14 @@ include(${CMAKE_CURRENT_LIST_DIR}/check-common.cmake)
 
 string(REPLACE ${path_prefix} "" test_shell_path ${test_shell_path})
 
-if(MSYS)
-  check(test_shell_path [[/c/shell/path]])
-elseif(WIN32)
-  check(test_shell_path [[c:\shell\path]])
+if(WIN32)
+  if(CMAKE_GENERATOR STREQUAL "MSYS Makefiles")
+    check(test_shell_path [[/c/shell/path]])
+  elseif(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
+    check(test_shell_path [[c:/shell/path]])
+  else()
+    check(test_shell_path [[c:\shell\path]])
+  endif()
 else()
   check(test_shell_path [[/shell/path]])
 endif()

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

Summary of changes:
 Tests/GeneratorExpression/CMakeLists.txt    |    2 +-
 Tests/GeneratorExpression/check-part4.cmake |   12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake