summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake/CMakeLists.txt
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-11-17 13:37:07 (GMT)
committerBrad King <brad.king@kitware.com>2023-11-17 13:40:14 (GMT)
commitc39384f54019adce87d676a7ed6d8e772ce5b7f8 (patch)
treea145468f44cf05da4c116b581917e38ec5088b61 /Tests/RunCMake/CMakeLists.txt
parent5e79703f93be8374efd8e9dfe570d03a6c48e4ab (diff)
downloadCMake-c39384f54019adce87d676a7ed6d8e772ce5b7f8.zip
CMake-c39384f54019adce87d676a7ed6d8e772ce5b7f8.tar.gz
CMake-c39384f54019adce87d676a7ed6d8e772ce5b7f8.tar.bz2
Tests: Simplify RunCMake.Swift conditions to enable use of Swift
Diffstat (limited to 'Tests/RunCMake/CMakeLists.txt')
-rw-r--r--Tests/RunCMake/CMakeLists.txt8
1 files changed, 3 insertions, 5 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)