diff options
author | Craig Scott <craig.scott@crascit.com> | 2019-11-12 13:16:17 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-12 13:16:31 (GMT) |
commit | 00f5e0206037ceec2d3c33569d1c845fdffa504f (patch) | |
tree | f9ef1bb0763822238e4ae0ccdb318eba2d05a6bf /Source | |
parent | 5e328c6d74ed6b6470e1df1005d07fe930185b52 (diff) | |
parent | 1d1fa5d3e4f3594f1c1db258e526c4b747117aa2 (diff) | |
download | CMake-00f5e0206037ceec2d3c33569d1c845fdffa504f.zip CMake-00f5e0206037ceec2d3c33569d1c845fdffa504f.tar.gz CMake-00f5e0206037ceec2d3c33569d1c845fdffa504f.tar.bz2 |
Merge topic 'remove-CPACK_INSTALL_CMAKE_CONFIGURATIONS' into release-3.16
1d1fa5d3e4 Tests: Add RunCMake.CPackCommandLine case for multi-config package
108207cc84 CPack: Remove CPACK_INSTALL_CMAKE_CONFIGURATIONS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4025
Diffstat (limited to 'Source')
-rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 153f328..7a6c50b 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -605,14 +605,6 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( cmExpandList(buildConfig, buildConfigs); } - // Try get configurations requested by the user explicitly - { - const char* const configsCstr = - this->GetOption("CPACK_INSTALL_CMAKE_CONFIGURATIONS"); - auto configs = configsCstr ? configsCstr : std::string{}; - cmExpandList(configs, buildConfigs); - } - // Remove duplicates std::sort(buildConfigs.begin(), buildConfigs.end()); buildConfigs.erase(std::unique(buildConfigs.begin(), buildConfigs.end()), |