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 c52d65dbee29af9141d12cfd2f5c1c5b4ac5a3a5 (commit)
via e77c0b4758d3721990e67532f8081abbcb83a23f (commit)
from 80ca453b3313688e40750f0908c05a77d5c4a3d4 (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=c52d65dbee29af9141d12cfd2f5c1c5b4ac5a3a5
commit c52d65dbee29af9141d12cfd2f5c1c5b4ac5a3a5
Merge: 80ca453 e77c0b4
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Mar 19 15:08:13 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Mar 19 15:08:13 2015 -0400
Merge topic 'xcode-xctest' into next
e77c0b47 fixup! Tests: Add XCTest example to test Frameworks and Cocoa App
Bundles
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e77c0b4758d3721990e67532f8081abbcb83a23f
commit e77c0b4758d3721990e67532f8081abbcb83a23f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Mar 19 14:56:52 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Mar 19 14:57:01 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 71cdb0f..aa03f86 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1505,7 +1505,9 @@ ${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 5
+ 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)
endif()
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
