diff options
| author | Brad King <brad.king@kitware.com> | 2010-09-14 17:07:59 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-09-14 17:07:59 (GMT) |
| commit | 1ae9832988a22c9803b5675cad16290ac1f53146 (patch) | |
| tree | 46d824b2225a32a3117696e39346a46ffbe923d8 /Source/cmExportCommand.cxx | |
| parent | becc11f72f36f689977440038253a0106a72e427 (diff) | |
| parent | b06fb1668424514bf45794d40bfc9f88dd5d619c (diff) | |
| download | CMake-1ae9832988a22c9803b5675cad16290ac1f53146.zip CMake-1ae9832988a22c9803b5675cad16290ac1f53146.tar.gz CMake-1ae9832988a22c9803b5675cad16290ac1f53146.tar.bz2 | |
Merge topic 'multi-v-single-configuration'
b06fb16 No CMAKE_CONFIGURATION_TYPES in single-config generators (#10202)
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(""); |