diff options
| author | Brad King <brad.king@kitware.com> | 2023-11-17 13:37:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-11-17 13:40:14 (GMT) |
| commit | c39384f54019adce87d676a7ed6d8e772ce5b7f8 (patch) | |
| tree | a145468f44cf05da4c116b581917e38ec5088b61 | |
| parent | 5e79703f93be8374efd8e9dfe570d03a6c48e4ab (diff) | |
| download | CMake-c39384f54019adce87d676a7ed6d8e772ce5b7f8.zip CMake-c39384f54019adce87d676a7ed6d8e772ce5b7f8.tar.gz CMake-c39384f54019adce87d676a7ed6d8e772ce5b7f8.tar.bz2 | |
Tests: Simplify RunCMake.Swift conditions to enable use of Swift
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Tests/RunCMake/Swift/RunCMakeTest.cmake | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 9f8a459..6cdb241 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -87,10 +87,6 @@ endfunction() # Some tests use python for extra checks. find_package(Python QUIET) -if(XCODE_VERSION AND "${XCODE_VERSION}" VERSION_LESS 6.1) - set(Swift_ARGS -DXCODE_BELOW_6_1=1) -endif() - # Test MSVC for older host CMake versions, and test # WIN32/CMAKE_C_COMPILER_ID to fix check on Intel for Windows. if(MSVC OR (WIN32 AND CMAKE_C_COMPILER_ID MATCHES "MSVC|Intel") @@ -435,7 +431,9 @@ if(UNIX AND CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG AND CMAKE_EXECUTABLE_FORMAT STRE add_RunCMake_test(RuntimePath) endif() add_RunCMake_test(ScriptMode) -add_RunCMake_test(Swift -DCMAKE_Swift_COMPILER=${CMAKE_Swift_COMPILER} -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}) +add_RunCMake_test(Swift -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME} + -DCMake_TEST_Swift=${CMake_TEST_Swift} + -DXCODE_VERSION=${XCODE_VERSION}) add_RunCMake_test(TargetArtifacts -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}) add_RunCMake_test(TargetObjects) add_RunCMake_test(TargetProperties) diff --git a/Tests/RunCMake/Swift/RunCMakeTest.cmake b/Tests/RunCMake/Swift/RunCMakeTest.cmake index 5537c01..2d9f90d 100644 --- a/Tests/RunCMake/Swift/RunCMakeTest.cmake +++ b/Tests/RunCMake/Swift/RunCMakeTest.cmake @@ -1,11 +1,11 @@ include(RunCMake) if(RunCMake_GENERATOR STREQUAL Xcode) - if(XCODE_BELOW_6_1) + if(XCODE_VERSION VERSION_LESS 6.1) run_cmake(XcodeTooOld) endif() elseif(RunCMake_GENERATOR STREQUAL Ninja) - if(CMAKE_Swift_COMPILER) + if(CMake_TEST_Swift) if (CMAKE_SYSTEM_NAME MATCHES "Windows") run_cmake_with_options(Win32ExecutableDisallowed) else() @@ -47,7 +47,7 @@ elseif(RunCMake_GENERATOR STREQUAL Ninja) endif() elseif(RunCMake_GENERATOR STREQUAL "Ninja Multi-Config") - if(CMAKE_Swift_COMPILER) + if(CMake_TEST_Swift) set(RunCMake_TEST_OPTIONS "-DCMAKE_CONFIGURATION_TYPES=Debug\\;Release") run_cmake(SwiftSimple) unset(RunCMake_TEST_OPTIONS) |