[Cmake-commits] CMake branch, next, updated. v3.0.0-4267-g338096a

[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  338096a46bdf0c6354b0c6678de6717e386546ab (commit)
       via  b8aa74842785fc6d5b56ad3745dbbcd9d93d257f (commit)
      from  9ba0ee21f31631968832bfe2174d7d8426ce3d8c (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=338096a46bdf0c6354b0c6678de6717e386546ab
commit 338096a46bdf0c6354b0c6678de6717e386546ab
Merge: 9ba0ee2 b8aa748
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 15 14:32:22 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 15 14:32:22 2014 -0400

    Merge topic 'fix_Xcode_generator_name' into next
    
    b8aa7484 Tests: No SubDirSpaces on Xcode


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8aa74842785fc6d5b56ad3745dbbcd9d93d257f
commit b8aa74842785fc6d5b56ad3745dbbcd9d93d257f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 15 14:33:21 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 15 14:33:21 2014 -0400

    Tests: No SubDirSpaces on Xcode

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index d25986b..ca7fcdc 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1502,7 +1502,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
       )
   endif()
 
-  if(MAKE_SUPPORTS_SPACES)
+  if(MAKE_SUPPORTS_SPACES AND NOT CMAKE_GENERATOR STREQUAL "Xcode")
     add_test(SubDirSpaces ${CMAKE_CTEST_COMMAND}
       --build-and-test
       "${CMake_SOURCE_DIR}/Tests/SubDirSpaces"

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

Summary of changes:
 Tests/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake