Swift: Require Xcode 6.1 and for MacOS X at least SDK 10.10
This commit is contained in:
parent
4da60024ad
commit
d778a1c2ff
|
@ -213,6 +213,29 @@ if(BUILD_TESTING)
|
||||||
set(CMake_TEST_XCODE_VERSION "${CMAKE_MATCH_1}")
|
set(CMake_TEST_XCODE_VERSION "${CMAKE_MATCH_1}")
|
||||||
endif()
|
endif()
|
||||||
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()
|
endif()
|
||||||
|
|
||||||
# Use 1500 or CTEST_TEST_TIMEOUT for long test timeout value,
|
# Use 1500 or CTEST_TEST_TIMEOUT for long test timeout value,
|
||||||
|
@ -258,10 +281,14 @@ if(BUILD_TESTING)
|
||||||
ADD_TEST_MACRO(MissingSourceFile MissingSourceFile)
|
ADD_TEST_MACRO(MissingSourceFile MissingSourceFile)
|
||||||
set_tests_properties(MissingSourceFile PROPERTIES
|
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")
|
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_TEST_XCODE_VERSION AND CMAKE_OSX_SDKVERSION AND CMAKE_OSX_SDKPRODUCT)
|
||||||
if(CMAKE_GENERATOR STREQUAL "Xcode")
|
if((NOT CMake_TEST_XCODE_VERSION VERSION_LESS 6.1) AND
|
||||||
ADD_TEST_MACRO(SwiftMix SwiftMix)
|
((NOT CMAKE_OSX_SDKPRODUCT STREQUAL "Mac OS X") OR
|
||||||
ADD_TEST_MACRO(SwiftOnly SwiftOnly)
|
(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()
|
||||||
endif()
|
endif()
|
||||||
if(CMAKE_Fortran_COMPILER)
|
if(CMAKE_Fortran_COMPILER)
|
||||||
|
|
Loading…
Reference in New Issue