diff options
author | Brad King <brad.king@kitware.com> | 2018-01-08 16:14:12 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2018-01-08 16:14:16 (GMT) |
commit | f7f34a46e674fcf0326b0dbbc6dbb35c9e3c022f (patch) | |
tree | 2a556a0358e403e4961b8f4a23bf2767899a437d /Tests/CMakeOnly/SelectLibraryConfigurations/CMakeLists.txt | |
parent | f4a314394039708e772374e54a31959f2de14825 (diff) | |
parent | 3c413e2a31b4fcb6a99dba04669c6a6517b97832 (diff) | |
download | CMake-f7f34a46e674fcf0326b0dbbc6dbb35c9e3c022f.zip CMake-f7f34a46e674fcf0326b0dbbc6dbb35c9e3c022f.tar.gz CMake-f7f34a46e674fcf0326b0dbbc6dbb35c9e3c022f.tar.bz2 |
Merge topic 'use_generator_is_multi_config'
3c413e2a GENERATOR_IS_MULTI_CONFIG: Use for multi-config checks in Modules
c267ea1c GENERATOR_IS_MULTI_CONFIG: Use for multi-config checks in Tests
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1627
Diffstat (limited to 'Tests/CMakeOnly/SelectLibraryConfigurations/CMakeLists.txt')
-rw-r--r-- | Tests/CMakeOnly/SelectLibraryConfigurations/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Tests/CMakeOnly/SelectLibraryConfigurations/CMakeLists.txt b/Tests/CMakeOnly/SelectLibraryConfigurations/CMakeLists.txt index 6d1628a..3676b17 100644 --- a/Tests/CMakeOnly/SelectLibraryConfigurations/CMakeLists.txt +++ b/Tests/CMakeOnly/SelectLibraryConfigurations/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.9) project(SelectLibraryConfigurations NONE) @@ -15,7 +15,8 @@ macro(check_slc basename expect) endif () endmacro(check_slc) -if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) +get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if (NOT _isMultiConfig AND NOT CMAKE_BUILD_TYPE) set(NOTYPE_RELONLY_LIBRARY_RELEASE "opt") check_slc(NOTYPE_RELONLY "opt") |