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/cmGlobalXCodeGenerator.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/cmGlobalXCodeGenerator.cxx')
-rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 537a88f..c63b403 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -722,26 +722,10 @@ void cmGlobalXCodeGenerator::SetCurrentLocalGenerator(cmLocalGenerator* gen) // Select the current set of configuration types. this->CurrentConfigurationTypes.clear(); - if(this->XcodeVersion > 20) - { - if(const char* types = - this->CurrentMakefile->GetDefinition("CMAKE_CONFIGURATION_TYPES")) - { - cmSystemTools::ExpandListArgument(types, - this->CurrentConfigurationTypes); - } - } + this->CurrentMakefile->GetConfigurations(this->CurrentConfigurationTypes); if(this->CurrentConfigurationTypes.empty()) { - if(const char* buildType = - this->CurrentMakefile->GetDefinition("CMAKE_BUILD_TYPE")) - { - this->CurrentConfigurationTypes.push_back(buildType); - } - else - { - this->CurrentConfigurationTypes.push_back(""); - } + this->CurrentConfigurationTypes.push_back(""); } } |