Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-23 18:08:31 +08:00
Code Issues Projects Releases Wiki Activity

Tests: Simplify RunCMake.Swift conditions to enable use of Swift

Browse Source
This commit is contained in:
Brad King
2023-11-17 08:37:07 -05:00
parent 5e79703f93
commit c39384f540
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Tests/RunCMake/CMakeLists.txt
View File

@@ -87,10 +87,6 @@ endfunction()
# Some tests use python for extra checks. # Some tests use python for extra checks.
find_package(Python QUIET) 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 # Test MSVC for older host CMake versions, and test
# WIN32/CMAKE_C_COMPILER_ID to fix check on Intel for Windows. # WIN32/CMAKE_C_COMPILER_ID to fix check on Intel for Windows.
if(MSVC OR (WIN32 AND CMAKE_C_COMPILER_ID MATCHES "MSVC|Intel") 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) add_RunCMake_test(RuntimePath)
endif() endif()
add_RunCMake_test(ScriptMode) 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(TargetArtifacts -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME})
add_RunCMake_test(TargetObjects) add_RunCMake_test(TargetObjects)
add_RunCMake_test(TargetProperties) add_RunCMake_test(TargetProperties)

6
Tests/RunCMake/Swift/RunCMakeTest.cmake
View File

@@ -1,11 +1,11 @@
include(RunCMake) include(RunCMake)
if(RunCMake_GENERATOR STREQUAL Xcode) if(RunCMake_GENERATOR STREQUAL Xcode)
if(XCODE_BELOW_6_1) if(XCODE_VERSION VERSION_LESS 6.1)
run_cmake(XcodeTooOld) run_cmake(XcodeTooOld)
endif() endif()
elseif(RunCMake_GENERATOR STREQUAL Ninja) elseif(RunCMake_GENERATOR STREQUAL Ninja)
if(CMAKE_Swift_COMPILER) if(CMake_TEST_Swift)
if (CMAKE_SYSTEM_NAME MATCHES "Windows") if (CMAKE_SYSTEM_NAME MATCHES "Windows")
run_cmake_with_options(Win32ExecutableDisallowed) run_cmake_with_options(Win32ExecutableDisallowed)
else() else()
@@ -47,7 +47,7 @@ elseif(RunCMake_GENERATOR STREQUAL Ninja)
endif() endif()
elseif(RunCMake_GENERATOR STREQUAL "Ninja Multi-Config") elseif(RunCMake_GENERATOR STREQUAL "Ninja Multi-Config")
if(CMAKE_Swift_COMPILER) if(CMake_TEST_Swift)
set(RunCMake_TEST_OPTIONS "-DCMAKE_CONFIGURATION_TYPES=Debug\\;Release") set(RunCMake_TEST_OPTIONS "-DCMAKE_CONFIGURATION_TYPES=Debug\\;Release")
run_cmake(SwiftSimple) run_cmake(SwiftSimple)
unset(RunCMake_TEST_OPTIONS) unset(RunCMake_TEST_OPTIONS)