diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-06 19:23:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-02-11 11:24:22 (GMT) |
| commit | 1edf1385064d67885bafe09d472f82bf62d34641 (patch) | |
| tree | 44bbd397ed6def8d51e71a473a6817c2a1386339 /Tests/RunCMake/Swift | |
| parent | 65a1c379eeb5845a910c32d3ccfd155b0ddb55af (diff) | |
| download | CMake-1edf1385064d67885bafe09d472f82bf62d34641.zip CMake-1edf1385064d67885bafe09d472f82bf62d34641.tar.gz CMake-1edf1385064d67885bafe09d472f82bf62d34641.tar.bz2 | |
Tests/RunCMake: Update cmake_minimum_required versions
For policy-specific tests, use the version before the policy was
introduced. Otherwise, use 3.5 where possible.
Also, remove `cmake_minimum_required()` and `project()` calls from
individual cases where they are handled by `CMakeLists.txt`.
Diffstat (limited to 'Tests/RunCMake/Swift')
| -rw-r--r-- | Tests/RunCMake/Swift/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/Swift/SwiftMultiArch-stderr.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/Swift/SwiftMultiArch.cmake | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/Tests/RunCMake/Swift/CMakeLists.txt b/Tests/RunCMake/Swift/CMakeLists.txt index 74b3ff8..77030d6 100644 --- a/Tests/RunCMake/Swift/CMakeLists.txt +++ b/Tests/RunCMake/Swift/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.15) project(${RunCMake_TEST} NONE) include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/Swift/SwiftMultiArch-stderr.txt b/Tests/RunCMake/Swift/SwiftMultiArch-stderr.txt index 874bdc7..16d2e21 100644 --- a/Tests/RunCMake/Swift/SwiftMultiArch-stderr.txt +++ b/Tests/RunCMake/Swift/SwiftMultiArch-stderr.txt @@ -1,4 +1,4 @@ -^CMake Error at SwiftMultiArch.cmake:3 \(project\): +^CMake Error at SwiftMultiArch.cmake:2 \(enable_language\): 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 index 5fdb688..b59bb62 100644 --- a/Tests/RunCMake/Swift/SwiftMultiArch.cmake +++ b/Tests/RunCMake/Swift/SwiftMultiArch.cmake @@ -1,4 +1,2 @@ -cmake_minimum_required(VERSION 3.15.1) set(CMAKE_OSX_ARCHITECTURES "armv7;arm64;i386;x86_64") -project(SwiftMultiArch - LANGUAGES Swift) +enable_language(Swift) |