[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3611-gffa34b4

[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  ffa34b4bfd95b86579a2911292a33a40cb137c6d (commit)
       via  0366ba5db62d99423e16c284cb7d4200d985ca1f (commit)
      from  42b70361df27cd14e45169af2c037d0b95feb954 (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=ffa34b4bfd95b86579a2911292a33a40cb137c6d
commit ffa34b4bfd95b86579a2911292a33a40cb137c6d
Merge: 42b7036 0366ba5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 6 10:29:09 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 6 10:29:09 2014 -0400

    Merge topic 'xcode15-fix-RunCMake-TargetSources' into next
    
    0366ba5d Tests: Fix RunCMake.TargetSources on Xcode 1.5


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0366ba5db62d99423e16c284cb7d4200d985ca1f
commit 0366ba5db62d99423e16c284cb7d4200d985ca1f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 6 10:01:07 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 6 10:28:32 2014 -0400

    Tests: Fix RunCMake.TargetSources on Xcode 1.5
    
    Xcode 1.5 does not support multiple configurations.  The generator also
    adds some sources internally that cause extra OriginDebug output.
    Update the expected output to tolerate it.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index d5af542..06272ce 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -16,6 +16,10 @@ if(XCODE_VERSION AND "${XCODE_VERSION}" VERSION_LESS 3)
   set(GeneratorToolset_ARGS -DXCODE_BELOW_3=1)
 endif()
 
+if(XCODE_VERSION AND "${XCODE_VERSION}" VERSION_LESS 2)
+  set(TargetSources_ARGS -DXCODE_BELOW_2=1)
+endif()
+
 add_RunCMake_test(CMP0019)
 add_RunCMake_test(CMP0022)
 add_RunCMake_test(CMP0026)
diff --git a/Tests/RunCMake/TargetSources/OriginDebug-stderr.txt b/Tests/RunCMake/TargetSources/OriginDebug-stderr.txt
index 0200dcb..11bc96c 100644
--- a/Tests/RunCMake/TargetSources/OriginDebug-stderr.txt
+++ b/Tests/RunCMake/TargetSources/OriginDebug-stderr.txt
@@ -5,7 +5,7 @@ CMake Debug Log at OriginDebug.cmake:13 \(add_library\):
 
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
-+
+.*
 CMake Debug Log at OriginDebug.cmake:16 \(set_property\):
   Used sources for target OriginDebug:
 
@@ -13,7 +13,7 @@ CMake Debug Log at OriginDebug.cmake:16 \(set_property\):
 
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
-+
+.*
 CMake Debug Log at OriginDebug.cmake:20 \(target_sources\):
   Used sources for target OriginDebug:
 
@@ -21,7 +21,7 @@ CMake Debug Log at OriginDebug.cmake:20 \(target_sources\):
 
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
-+
+.*
 CMake Debug Log at OriginDebug.cmake:14 \(target_link_libraries\):
   Used sources for target OriginDebug:
 
diff --git a/Tests/RunCMake/TargetSources/RunCMakeTest.cmake b/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
index 01e505c..1d2eaec 100644
--- a/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
+++ b/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
@@ -1,7 +1,6 @@
 include(RunCMake)
 
-if(RunCMake_GENERATOR MATCHES Xcode
-    OR RunCMake_GENERATOR MATCHES "Visual Studio")
+if(RunCMake_GENERATOR MATCHES "Visual Studio|Xcode" AND NOT XCODE_BELOW_2)
   run_cmake(ConfigNotAllowed)
   run_cmake(OriginDebugIDE)
 else()

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt                       |    4 ++++
 Tests/RunCMake/TargetSources/OriginDebug-stderr.txt |    6 +++---
 Tests/RunCMake/TargetSources/RunCMakeTest.cmake     |    3 +--
 3 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake