summaryrefslogtreecommitdiffstats
path: root/Tests/SimpleInstall
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-01-08 16:14:12 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-01-08 16:14:16 (GMT)
commitf7f34a46e674fcf0326b0dbbc6dbb35c9e3c022f (patch)
tree2a556a0358e403e4961b8f4a23bf2767899a437d /Tests/SimpleInstall
parentf4a314394039708e772374e54a31959f2de14825 (diff)
parent3c413e2a31b4fcb6a99dba04669c6a6517b97832 (diff)
downloadCMake-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/SimpleInstall')
-rw-r--r--Tests/SimpleInstall/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt
index b6a472e..a07f687 100644
--- a/Tests/SimpleInstall/CMakeLists.txt
+++ b/Tests/SimpleInstall/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.9)
project (TestSimpleInstall)
set(CMAKE_VERBOSE_MAKEFILE 1)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY
@@ -307,7 +307,8 @@ else()
INSTALL_NAME_DIR @executable_path/../lib)
endif()
-if(CMAKE_CONFIGURATION_TYPES)
+get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+if(_isMultiConfig)
set(SI_CONFIG --config $<CONFIGURATION>)
else()
set(SI_CONFIG)