[Cmake-commits] CMake branch, next, updated. v3.5.0-557-g46764d8

[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  46764d8624b86571d8036b0ac210d3d697c101e5 (commit)
       via  81f90a9a03d38609859adf945471b58f11c200f4 (commit)
      from  67ad9220b9adcf44680d44d7bd01414233b586fd (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=46764d8624b86571d8036b0ac210d3d697c101e5
commit 46764d8624b86571d8036b0ac210d3d697c101e5
Merge: 67ad922 81f90a9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 21 09:46:25 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 21 09:46:25 2016 -0400

    Merge topic 'ninja-directory-targets' into next
    
    81f90a9a fixup! Ninja: Add test for `$subdir/all` targets


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81f90a9a03d38609859adf945471b58f11c200f4
commit 81f90a9a03d38609859adf945471b58f11c200f4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 21 09:45:35 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 21 09:45:35 2016 -0400

    fixup! Ninja: Add test for `$subdir/all` targets

diff --git a/Tests/RunCMake/Ninja/RunCMakeTest.cmake b/Tests/RunCMake/Ninja/RunCMakeTest.cmake
index cdf51d9..4e06888 100644
--- a/Tests/RunCMake/Ninja/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Ninja/RunCMakeTest.cmake
@@ -24,6 +24,11 @@ function(run_SubDir)
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
   file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
   run_cmake(SubDir)
-  run_cmake_command(SubDir-build ${CMAKE_COMMAND} --build . --target SubDir/all)
+  if(WIN32)
+    set(SubDir_all [[SubDir\all]])
+  else()
+    set(SubDir_all [[SubDir/all]])
+  endif()
+  run_cmake_command(SubDir-build ${CMAKE_COMMAND} --build . --target ${SubDir_all})
 endfunction()
 run_SubDir()

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

Summary of changes:
 Tests/RunCMake/Ninja/RunCMakeTest.cmake |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake