diff options
author | Brad King <brad.king@kitware.com> | 2010-09-08 18:54:49 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2010-09-08 18:54:49 (GMT) |
commit | b06fb1668424514bf45794d40bfc9f88dd5d619c (patch) | |
tree | 66ae0b807e08cf844b9786624ce441f5563f7a8c /Source/cmExportCommand.cxx | |
parent | f444b9555f87ec187bff51d48cd29c22ab4a6121 (diff) | |
download | CMake-b06fb1668424514bf45794d40bfc9f88dd5d619c.zip CMake-b06fb1668424514bf45794d40bfc9f88dd5d619c.tar.gz CMake-b06fb1668424514bf45794d40bfc9f88dd5d619c.tar.bz2 |
No CMAKE_CONFIGURATION_TYPES in single-config generators (#10202)
Factor out reading of CMAKE_CONFIGURATION_TYPES and CMAKE_BUILD_TYPE
into cmMakefile::GetConfigurations. Read the former only in
multi-config generators.
Diffstat (limited to 'Source/cmExportCommand.cxx')
-rw-r--r-- | Source/cmExportCommand.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx index 48c5c6e..cb614d4 100644 --- a/Source/cmExportCommand.cxx +++ b/Source/cmExportCommand.cxx @@ -152,11 +152,10 @@ bool cmExportCommand ebfg.SetCommand(this); // Compute the set of configurations exported. - if(const char* types = - this->Makefile->GetDefinition("CMAKE_CONFIGURATION_TYPES")) + std::vector<std::string> configurationTypes; + this->Makefile->GetConfigurations(configurationTypes); + if(!configurationTypes.empty()) { - std::vector<std::string> configurationTypes; - cmSystemTools::ExpandListArgument(types, configurationTypes); for(std::vector<std::string>::const_iterator ci = configurationTypes.begin(); ci != configurationTypes.end(); ++ci) @@ -164,11 +163,6 @@ bool cmExportCommand ebfg.AddConfiguration(ci->c_str()); } } - else if(const char* config = - this->Makefile->GetDefinition("CMAKE_BUILD_TYPE")) - { - ebfg.AddConfiguration(config); - } else { ebfg.AddConfiguration(""); |