[Cmake-commits] CMake branch, next, updated. v3.0.0-4322-g3ac03fb

Brad King brad.king at kitware.com
Thu Jul 17 08:18:20 EDT 2014


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  3ac03fb1e3a9634721101e4b4566b37daa9929b7 (commit)
       via  727ab63ca8f9b174e11630b11a373b5837da0b75 (commit)
      from  f1e74a6f0351650fd7108f34e8f63bb8f1e4ab6d (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=3ac03fb1e3a9634721101e4b4566b37daa9929b7
commit 3ac03fb1e3a9634721101e4b4566b37daa9929b7
Merge: f1e74a6 727ab63
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 17 08:18:19 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 17 08:18:19 2014 -0400

    Merge topic 'fix_Xcode_generator_name' into next
    
    727ab63c Revert "Tests: Xcode >= 3 passes SubDirSpaces"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=727ab63ca8f9b174e11630b11a373b5837da0b75
commit 727ab63ca8f9b174e11630b11a373b5837da0b75
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 17 08:19:08 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 17 08:19:20 2014 -0400

    Revert "Tests: Xcode >= 3 passes SubDirSpaces"
    
    This reverts commit 2427f523f629ee82847bc934be2cd6c6f1074560.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 90cc9ef..ca7fcdc 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1502,8 +1502,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
       )
   endif()
 
-  if(MAKE_SUPPORTS_SPACES AND
-     NOT (CMAKE_GENERATOR STREQUAL "Xcode" AND XCODE_VERSION VERSION_LESS 3))
+  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 |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list