[Cmake-commits] CMake branch, next, updated. v3.2.1-1117-g09b0ec9
Brad King
brad.king at kitware.com
Fri Mar 20 10:11:13 EDT 2015
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 09b0ec9428c45f7d95bf4f2aedac27f2ccec80c6 (commit)
via 6eee67b2cc2a93ceddd6adef27e9df630c81e342 (commit)
from f855c4e9157360d4f7bd8f13dc5dc1ed1aeb74a6 (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=09b0ec9428c45f7d95bf4f2aedac27f2ccec80c6
commit 09b0ec9428c45f7d95bf4f2aedac27f2ccec80c6
Merge: f855c4e 6eee67b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 20 10:11:13 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 20 10:11:13 2015 -0400
Merge topic 'xcode-xctest' into next
6eee67b2 fixup! Tests: Add XCTest example to test Frameworks and Cocoa App Bundles
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6eee67b2cc2a93ceddd6adef27e9df630c81e342
commit 6eee67b2cc2a93ceddd6adef27e9df630c81e342
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 20 10:09:11 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 20 10:09:11 2015 -0400
fixup! Tests: Add XCTest example to test Frameworks and Cocoa App Bundles
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index aa03f86..9e419f8 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1505,7 +1505,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
)
endif()
- if(CMake_TEST_XCODE_VERSION AND NOT CMake_TEST_XCODE_VERSION VERSION_LESS 5
+ if(CMake_TEST_XCODE_VERSION AND NOT CMake_TEST_XCODE_VERSION VERSION_LESS 6
AND OSX_VERSION MATCHES "^([0-9]+\\.[0-9]+)")
set(XCTest_BUILD_OPTIONS -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_MATCH_1})
ADD_TEST_MACRO(XCTest ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION> -V)
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list