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 6985b37195c2b0336f3702cba64fb83d52a7d2b1 (commit)
via d778a1c2ff56c425678bb9ec630c4fbd3d63bbbc (commit)
from bb946e544e4895670f946c252234c101c37443d0 (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=6985b37195c2b0336f3702cba64fb83d52a7d2b1
commit 6985b37195c2b0336f3702cba64fb83d52a7d2b1
Merge: bb946e5 d778a1c
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Sat Sep 5 17:40:49 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Sep 5 17:40:49 2015 -0400
Merge topic 'more-swift2-fixes' into next
d778a1c2 Swift: Require Xcode 6.1 and for MacOS X at least SDK 10.10
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d778a1c2ff56c425678bb9ec630c4fbd3d63bbbc
commit d778a1c2ff56c425678bb9ec630c4fbd3d63bbbc
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Sat Sep 5 23:39:27 2015 +0200
Commit: Gregor Jasny <gja...@googlemail.com>
CommitDate: Sat Sep 5 23:39:27 2015 +0200
Swift: Require Xcode 6.1 and for MacOS X at least SDK 10.10
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 801d7e8..2c6a42c 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -213,6 +213,29 @@ if(BUILD_TESTING)
set(CMake_TEST_XCODE_VERSION "${CMAKE_MATCH_1}")
endif()
endif()
+ if(CMAKE_OSX_SYSROOT)
+ execute_process(
+ COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version ProductName
+ OUTPUT_VARIABLE _stdout
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ ERROR_VARIABLE _stderr
+ RESULT_VARIABLE _failed
+ )
+ if(NOT _failed)
+ set(CMAKE_OSX_SDKPRODUCT "${_stdout}")
+ endif()
+
+ execute_process(
+ COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version SDKVersion
+ OUTPUT_VARIABLE _stdout
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ ERROR_VARIABLE _stderr
+ RESULT_VARIABLE _failed
+ )
+ if(NOT _failed)
+ set(CMAKE_OSX_SDKVERSION "${_stdout}")
+ endif()
+ endif()
endif()
# Use 1500 or CTEST_TEST_TIMEOUT for long test timeout value,
@@ -258,10 +281,14 @@ if(BUILD_TESTING)
ADD_TEST_MACRO(MissingSourceFile MissingSourceFile)
set_tests_properties(MissingSourceFile PROPERTIES
PASS_REGULAR_EXPRESSION "CMake Error at CMakeLists.txt:3
\\(add_executable\\):[ \r\n]*Cannot find source file:[
\r\n]*DoesNotExist/MissingSourceFile.c")
- if(CMake_TEST_XCODE_VERSION AND NOT CMake_TEST_XCODE_VERSION VERSION_LESS
6.1)
- if(CMAKE_GENERATOR STREQUAL "Xcode")
- ADD_TEST_MACRO(SwiftMix SwiftMix)
- ADD_TEST_MACRO(SwiftOnly SwiftOnly)
+ if(CMake_TEST_XCODE_VERSION AND CMAKE_OSX_SDKVERSION AND
CMAKE_OSX_SDKPRODUCT)
+ if((NOT CMake_TEST_XCODE_VERSION VERSION_LESS 6.1) AND
+ ((NOT CMAKE_OSX_SDKPRODUCT STREQUAL "Mac OS X") OR
+ (NOT CMAKE_OSX_SDKVERSION VERSION_LESS 10.10)))
+ if(CMAKE_GENERATOR STREQUAL "Xcode")
+ ADD_TEST_MACRO(SwiftMix SwiftMix)
+ ADD_TEST_MACRO(SwiftOnly SwiftOnly)
+ endif()
endif()
endif()
if(CMAKE_Fortran_COMPILER)
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 35 +++++++++++++++++++++++++++++++----
1 file changed, 31 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
