diff options
author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-03-10 14:16:07 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-10 14:16:17 (GMT) |
commit | 228232d4546b10d5486017631f85252c2beb52ff (patch) | |
tree | c2d40b4bc1bda26ae8dc60bfb0653c8a6eb70c66 /Tests | |
parent | 268909518f837f4331c758f4ceaec42fbb2def00 (diff) | |
parent | 87819db28d28a95b2894054b38bda17c546bc572 (diff) | |
download | CMake-228232d4546b10d5486017631f85252c2beb52ff.zip CMake-228232d4546b10d5486017631f85252c2beb52ff.tar.gz CMake-228232d4546b10d5486017631f85252c2beb52ff.tar.bz2 |
Merge topic 'swift-ninja-multiconfig'
87819db28d Merge branch 'backport-swift-ninja-multiconfig' into swift-ninja-multiconfig
65b3848de0 Swift: support Ninja Multi-Config
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4440
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/RunCMake/Swift/L.swift | 1 | ||||
-rw-r--r-- | Tests/RunCMake/Swift/RunCMakeTest.cmake | 6 | ||||
-rw-r--r-- | Tests/RunCMake/Swift/SwiftSimple.cmake | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/Tests/RunCMake/Swift/L.swift b/Tests/RunCMake/Swift/L.swift new file mode 100644 index 0000000..79ff87e --- /dev/null +++ b/Tests/RunCMake/Swift/L.swift @@ -0,0 +1 @@ +public let ThirtyTwo: Int = 32 diff --git a/Tests/RunCMake/Swift/RunCMakeTest.cmake b/Tests/RunCMake/Swift/RunCMakeTest.cmake index 918df0b..1db202e 100644 --- a/Tests/RunCMake/Swift/RunCMakeTest.cmake +++ b/Tests/RunCMake/Swift/RunCMakeTest.cmake @@ -12,6 +12,12 @@ elseif(RunCMake_GENERATOR STREQUAL Ninja) run_cmake(SwiftMultiArch) unset(RunCMake_TEST_OPTIONS) endif() +elseif(RunCMake_GENERATOR STREQUAL "Ninja Multi-Config") + if(CMAKE_Swift_COMPILER) + set(RunCMake_TEST_OPTIONS "-DCMAKE_CONFIGURATION_TYPES=Debug\\;Release") + run_cmake(SwiftSimple) + unset(RunCMake_TEST_OPTIONS) + endif() else() run_cmake(NotSupported) endif() diff --git a/Tests/RunCMake/Swift/SwiftSimple.cmake b/Tests/RunCMake/Swift/SwiftSimple.cmake new file mode 100644 index 0000000..1f2702d --- /dev/null +++ b/Tests/RunCMake/Swift/SwiftSimple.cmake @@ -0,0 +1,2 @@ +enable_language(Swift) +add_library(L L.swift) |