diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-29 15:32:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-29 15:32:38 (GMT) |
| commit | 38ee7db2ac34902e1fac58c2763ac72a7b2adb75 (patch) | |
| tree | a5e45bbfc85a479ba43bb0a7986376a67afb83cc /Tests | |
| parent | c46a26a4c9c097fd34c1b83282ad51ca82cd824d (diff) | |
| parent | 15f6606abdf383c72461651c8cd4ab01cd3da175 (diff) | |
| download | CMake-38ee7db2ac34902e1fac58c2763ac72a7b2adb75.zip CMake-38ee7db2ac34902e1fac58c2763ac72a7b2adb75.tar.gz CMake-38ee7db2ac34902e1fac58c2763ac72a7b2adb75.tar.bz2 | |
Merge topic 'mixed-mode-multi-arch'
15f6606abd Swift: disallow multiple `CMAKE_OSX_ARCHITECTURES` with Swift
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4283
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/Swift/RunCMakeTest.cmake | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/Swift/SwiftMultiArch-result.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/Swift/SwiftMultiArch-stderr.txt | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/Swift/SwiftMultiArch.cmake | 4 |
4 files changed, 13 insertions, 0 deletions
diff --git a/Tests/RunCMake/Swift/RunCMakeTest.cmake b/Tests/RunCMake/Swift/RunCMakeTest.cmake index 4817045..918df0b 100644 --- a/Tests/RunCMake/Swift/RunCMakeTest.cmake +++ b/Tests/RunCMake/Swift/RunCMakeTest.cmake @@ -7,6 +7,10 @@ if(RunCMake_GENERATOR STREQUAL Xcode) elseif(RunCMake_GENERATOR STREQUAL Ninja) if(CMAKE_Swift_COMPILER) run_cmake(Win32ExecutableDisallowed) + + set(RunCMake_TEST_OPTIONS -DCMAKE_SYSTEM_NAME=Darwin) + run_cmake(SwiftMultiArch) + unset(RunCMake_TEST_OPTIONS) endif() else() run_cmake(NotSupported) diff --git a/Tests/RunCMake/Swift/SwiftMultiArch-result.txt b/Tests/RunCMake/Swift/SwiftMultiArch-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/Swift/SwiftMultiArch-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/Swift/SwiftMultiArch-stderr.txt b/Tests/RunCMake/Swift/SwiftMultiArch-stderr.txt new file mode 100644 index 0000000..874bdc7 --- /dev/null +++ b/Tests/RunCMake/Swift/SwiftMultiArch-stderr.txt @@ -0,0 +1,4 @@ +^CMake Error at SwiftMultiArch.cmake:3 \(project\): + multiple values for CMAKE_OSX_ARCHITECTURES not supported with Swift +Call Stack \(most recent call first\): + CMakeLists.txt:3 diff --git a/Tests/RunCMake/Swift/SwiftMultiArch.cmake b/Tests/RunCMake/Swift/SwiftMultiArch.cmake new file mode 100644 index 0000000..5fdb688 --- /dev/null +++ b/Tests/RunCMake/Swift/SwiftMultiArch.cmake @@ -0,0 +1,4 @@ +cmake_minimum_required(VERSION 3.15.1) +set(CMAKE_OSX_ARCHITECTURES "armv7;arm64;i386;x86_64") +project(SwiftMultiArch + LANGUAGES Swift) |