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/ExportImport | |
| 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/ExportImport')
| -rw-r--r-- | Tests/ExportImport/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Tests/ExportImport/CMakeLists.txt b/Tests/ExportImport/CMakeLists.txt index eaad3d4..dc621eb 100644 --- a/Tests/ExportImport/CMakeLists.txt +++ b/Tests/ExportImport/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.7.20090711) +cmake_minimum_required (VERSION 3.9) project(ExportImport C CXX) if(NOT DEFINED CMake_TEST_NESTED_MAKE_PROGRAM AND NOT CMAKE_GENERATOR MATCHES "Visual Studio") set(CMake_TEST_NESTED_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM}") @@ -15,7 +15,8 @@ set_property( PROPERTY SYMBOLIC 1 ) -if(CMAKE_CONFIGURATION_TYPES) +get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(_isMultiConfig) set(NESTED_CONFIG_TYPE -C "${CMAKE_CFG_INTDIR}") else() if(CMAKE_BUILD_TYPE) |