[Cmake-commits] CMake branch, next, updated. v3.0.0-4329-g6f9ed3e

[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  6f9ed3e5b7b9b97b58af9464d927bbda55dea6b4 (commit)
       via  3526478cc093f1fc6c1887e1059f337fb7086cc7 (commit)
      from  90d9a5d367cf433b8431aedbe08604284efb9a9a (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=6f9ed3e5b7b9b97b58af9464d927bbda55dea6b4
commit 6f9ed3e5b7b9b97b58af9464d927bbda55dea6b4
Merge: 90d9a5d 3526478
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 17 09:31:07 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 17 09:31:07 2014 -0400

    Merge topic 'fix_Xcode_generator_name' into next
    
    3526478c Tests: Activate tests accidentally excluded from Xcode


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3526478cc093f1fc6c1887e1059f337fb7086cc7
commit 3526478cc093f1fc6c1887e1059f337fb7086cc7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 17 09:31:53 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 17 09:31:53 2014 -0400

    Tests: Activate tests accidentally excluded from Xcode
    
    The generator name is "Xcode", not "XCode".  Fix this typo.  Explicitly
    exclude the SubDirSpaces test on Xcode because it does not work.  Also
    tell the RunCMake.File_Generate test when Xcode is not multi-config so
    it can exlcude the OutputConflict case.
    
    Inspired-by: Daniele E. Domenichelli <daniele.domenichelli at iit.it>

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index dc4f894..ca7fcdc 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -77,7 +77,7 @@ if(BUILD_TESTING)
   # some old versions of make simply cannot handle spaces in paths
   if (MAKE_IS_GNU OR
       CMAKE_MAKE_PROGRAM MATCHES "nmake|gmake|wmake" OR
-      CMAKE_GENERATOR MATCHES "Visual Studio|XCode|Borland")
+      CMAKE_GENERATOR MATCHES "Visual Studio|Xcode|Borland")
     set(MAKE_SUPPORTS_SPACES 1)
   else()
     set(MAKE_SUPPORTS_SPACES 0)
@@ -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"
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 f74d17e..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:


hooks/post-receive
-- 
CMake