[Cmake-commits] CMake branch, next, updated. v3.0.0-4273-g14ca24e

[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  14ca24edb170aa43df9e8452f115b47e81687397 (commit)
       via  2427f523f629ee82847bc934be2cd6c6f1074560 (commit)
       via  54ed022ac89308fe24a473157f3c54d78b01c4e6 (commit)
      from  35318f60ed0af2b59a4bdb2b781b7af72bb3fc03 (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=14ca24edb170aa43df9e8452f115b47e81687397
commit 14ca24edb170aa43df9e8452f115b47e81687397
Merge: 35318f6 2427f52
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 16 10:00:31 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 16 10:00:31 2014 -0400

    Merge topic 'fix_Xcode_generator_name' into next
    
    2427f523 Tests: Xcode >= 3 passes SubDirSpaces
    54ed022a Tests: Xcode < 2 is not multi-config


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2427f523f629ee82847bc934be2cd6c6f1074560
commit 2427f523f629ee82847bc934be2cd6c6f1074560
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 16 09:59:15 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 16 09:59:15 2014 -0400

    Tests: Xcode >= 3 passes SubDirSpaces

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

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54ed022ac89308fe24a473157f3c54d78b01c4e6
commit 54ed022ac89308fe24a473157f3c54d78b01c4e6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 16 09:46:33 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 16 09:46:33 2014 -0400

    Tests: Xcode < 2 is not multi-config

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 06272ce..ff3b9a0 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -18,6 +18,7 @@ endif()
 
 if(XCODE_VERSION AND "${XCODE_VERSION}" VERSION_LESS 2)
   set(TargetSources_ARGS -DXCODE_BELOW_2=1)
+  set(File_Generate_ARGS -DXCODE_BELOW_2=1)
 endif()
 
 add_RunCMake_test(CMP0019)
diff --git a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
index 145d312..dee0692 100644
--- a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
+++ b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
@@ -1,8 +1,8 @@
 include(RunCMake)
 
 run_cmake(CommandConflict)
-if("${RunCMake_GENERATOR}" MATCHES "Visual Studio" OR "${RunCMake_GENERATOR}" MATCHES "Xcode" )
-    run_cmake(OutputConflict)
+if("${RunCMake_GENERATOR}" MATCHES "Visual Studio|Xcode" AND NOT XCODE_BELOW_2)
+  run_cmake(OutputConflict)
 endif()
 run_cmake(EmptyCondition1)
 run_cmake(EmptyCondition2)

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

Summary of changes:
 Tests/CMakeLists.txt                            |    3 ++-
 Tests/RunCMake/CMakeLists.txt                   |    1 +
 Tests/RunCMake/File_Generate/RunCMakeTest.cmake |    4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake