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 a0c84560458844f92855dfa82d9f9b6f0854a640 (commit)
via a0ac40fc58398e55fc89a148b58f0dc5c54d3242 (commit)
from 362b11c827c642858895b6e903bf9f1fc64a9435 (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=a0c84560458844f92855dfa82d9f9b6f0854a640
commit a0c84560458844f92855dfa82d9f9b6f0854a640
Merge: 362b11c a0ac40f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Feb 5 18:54:05 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Feb 5 18:54:05 2013 -0500
Merge topic 'generator-toolset' into next
a0ac40f Fix RunCMake.GeneratorToolset test on Xcode < 3
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0ac40fc58398e55fc89a148b58f0dc5c54d3242
commit a0ac40fc58398e55fc89a148b58f0dc5c54d3242
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Feb 5 18:52:08 2013 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Feb 5 18:52:40 2013 -0500
Fix RunCMake.GeneratorToolset test on Xcode < 3
The Xcode generator does not support a generator toolset on Xcode
versions before 3. Teach the test to cover the behavior expected for
the available version of Xcode.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index e71672e..320ebcc 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -42,10 +42,15 @@ macro(add_RunCMake_test test)
-DRunCMake_GENERATOR_TOOLSET=${CMAKE_TEST_GENERATOR_TOOLSET}
-DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${test}
-DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test}
+ ${${test}_ARGS}
-P "${CMAKE_CURRENT_SOURCE_DIR}/${test}/RunCMakeTest.cmake"
)
endmacro()
+if(XCODE_VERSION AND "${XCODE_VERSION}" VERSION_LESS 3)
+ set(GeneratorToolset_ARGS -DXCODE_BELOW_3=1)
+endif()
+
add_RunCMake_test(CMP0019)
add_RunCMake_test(ExternalData)
add_RunCMake_test(GeneratorExpression)
diff --git a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
index 400d0a8..09375d9 100644
--- a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
@@ -3,7 +3,7 @@ include(RunCMake)
set(RunCMake_GENERATOR_TOOLSET "")
run_cmake(NoToolset)
-if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[01]|Xcode")
+if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[01]|Xcode" AND NOT
XCODE_BELOW_3)
set(RunCMake_GENERATOR_TOOLSET "Test Toolset")
run_cmake(TestToolset)
else()
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CMakeLists.txt | 5 +++++
Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
