diff options
| author | Craig Scott <craig.scott@crascit.com> | 2017-12-29 22:17:32 +1100 |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2017-12-30 09:35:56 +1100 |
| commit | c267ea1c3e54626e4ab2283dc7529ed8aa8beac8 (patch) | |
| tree | e361a5bcdec7006768e3a4a79109c19efa34c9ee /Tests/RunCMake/CMP0060 | |
| parent | 497f4bb941a84bacfca2392759de6cb8e23b0684 (diff) | |
| download | cmake-c267ea1c3e54626e4ab2283dc7529ed8aa8beac8.tar.gz | |
GENERATOR_IS_MULTI_CONFIG: Use for multi-config checks in Tests
Diffstat (limited to 'Tests/RunCMake/CMP0060')
| -rw-r--r-- | Tests/RunCMake/CMP0060/CMP0060-Common.cmake | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/CMP0060/CMP0060-WARN-ON-stderr.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CMP0060/CMakeLists.txt | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Tests/RunCMake/CMP0060/CMP0060-Common.cmake b/Tests/RunCMake/CMP0060/CMP0060-Common.cmake index e0a56e68ce..06955eebab 100644 --- a/Tests/RunCMake/CMP0060/CMP0060-Common.cmake +++ b/Tests/RunCMake/CMP0060/CMP0060-Common.cmake @@ -1,6 +1,7 @@ # Always build in a predictable configuration. For multi-config # generators we depend on RunCMakeTest.cmake to do this for us. -if(NOT CMAKE_CONFIGURATION_TYPES) +get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(NOT _isMultiConfig) set(CMAKE_BUILD_TYPE Debug) endif() diff --git a/Tests/RunCMake/CMP0060/CMP0060-WARN-ON-stderr.txt b/Tests/RunCMake/CMP0060/CMP0060-WARN-ON-stderr.txt index f6cc97854a..e2c280ee73 100644 --- a/Tests/RunCMake/CMP0060/CMP0060-WARN-ON-stderr.txt +++ b/Tests/RunCMake/CMP0060/CMP0060-WARN-ON-stderr.txt @@ -12,5 +12,5 @@ will ask the linker to search for these by library name. Call Stack \(most recent call first\): CMP0060-WARN-ON.cmake:[0-9]+ \(include\) - CMakeLists.txt:3 \(include\) + CMakeLists.txt:4 \(include\) This warning is for project developers. Use -Wno-dev to suppress it.$ diff --git a/Tests/RunCMake/CMP0060/CMakeLists.txt b/Tests/RunCMake/CMP0060/CMakeLists.txt index db6b701c04..291d34d43d 100644 --- a/Tests/RunCMake/CMP0060/CMakeLists.txt +++ b/Tests/RunCMake/CMP0060/CMakeLists.txt @@ -1,3 +1,4 @@ -cmake_minimum_required(VERSION 3.2) +cmake_minimum_required(VERSION 3.9) +cmake_policy(VERSION 3.2) project(${RunCMake_TEST} C) include(${RunCMake_TEST}.cmake) |