diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-05 14:22:18 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-05 14:22:23 (GMT) |
| commit | d9bd7adfdfa0e06ec77507933664f7ae344dcf1a (patch) | |
| tree | 9f24d089d108f1424c5b5ae66a40403fe69a6798 /Help | |
| parent | fe263c9882c820fbcf969b9be6e18087e91e4ae1 (diff) | |
| parent | 01826231f8916057ad06555a3677c1806a2fb3be (diff) | |
| download | CMake-d9bd7adfdfa0e06ec77507933664f7ae344dcf1a.zip CMake-d9bd7adfdfa0e06ec77507933664f7ae344dcf1a.tar.gz CMake-d9bd7adfdfa0e06ec77507933664f7ae344dcf1a.tar.bz2 | |
Merge topic 'prop-is-multi-config'
01826231 Tests: Add case for GENERATOR_IS_MULTI_CONFIG
38fd5866 Add GENERATOR_IS_MULTI_CONFIG global property
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !657
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 1 | ||||
| -rw-r--r-- | Help/prop_gbl/GENERATOR_IS_MULTI_CONFIG.rst | 9 | ||||
| -rw-r--r-- | Help/release/dev/prop-is-multi-config.rst | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index 072d7c5..27c75dc 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -31,6 +31,7 @@ Properties of Global Scope /prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS /prop_gbl/FIND_LIBRARY_USE_LIBX32_PATHS /prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING + /prop_gbl/GENERATOR_IS_MULTI_CONFIG /prop_gbl/GLOBAL_DEPENDS_DEBUG_MODE /prop_gbl/GLOBAL_DEPENDS_NO_CYCLES /prop_gbl/IN_TRY_COMPILE diff --git a/Help/prop_gbl/GENERATOR_IS_MULTI_CONFIG.rst b/Help/prop_gbl/GENERATOR_IS_MULTI_CONFIG.rst new file mode 100644 index 0000000..b8ec8a6 --- /dev/null +++ b/Help/prop_gbl/GENERATOR_IS_MULTI_CONFIG.rst @@ -0,0 +1,9 @@ +GENERATOR_IS_MULTI_CONFIG +------------------------- + +Read-only property that is true on multi-configuration generators. + +True when using a multi-configuration generator +(such as :ref:`Visual Studio Generators` or :generator:`Xcode`). +Multi-config generators use :variable:`CMAKE_CONFIGURATION_TYPES` +as the set of configurations and ignore :variable:`CMAKE_BUILD_TYPE`. diff --git a/Help/release/dev/prop-is-multi-config.rst b/Help/release/dev/prop-is-multi-config.rst new file mode 100644 index 0000000..52de563 --- /dev/null +++ b/Help/release/dev/prop-is-multi-config.rst @@ -0,0 +1,6 @@ +prop-is-multi-config +-------------------- + +* A :prop_gbl:`GENERATOR_IS_MULTI_CONFIG` global property was + added to determine whether the current generator is a multi-configuration + generator (such as :ref:`Visual Studio Generators` or :generator:`Xcode`). |