diff options
| author | David Cole <david.cole@kitware.com> | 2012-04-03 19:59:56 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-04-03 19:59:56 (GMT) |
| commit | 5e9c7731e16fc077a3637a02cb983d397329a23a (patch) | |
| tree | 898fc8adf54274051210c2eaf84fce7780af40fb /Source | |
| parent | 046f0f869e2a33f6252012fab5cbb3a6d9b4548c (diff) | |
| parent | 0579fa045c854b732506887cdf3a9a54610748ab (diff) | |
| download | CMake-5e9c7731e16fc077a3637a02cb983d397329a23a.zip CMake-5e9c7731e16fc077a3637a02cb983d397329a23a.tar.gz CMake-5e9c7731e16fc077a3637a02cb983d397329a23a.tar.bz2 | |
Merge topic 'fix-13082-use-config-0'
0579fa0 Xcode: Pay attention to custom configuration types (#13082)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 56228f5..998843f 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -3023,6 +3023,7 @@ void cmGlobalXCodeGenerator cmXCodeObject* buildConfigurations = this->CreateObject(cmXCodeObject::OBJECT_LIST); std::vector<cmXCodeObject*> configs; + const char *defaultConfigName = "Debug"; if(this->XcodeVersion == 15) { cmXCodeObject* configDebug = @@ -3039,6 +3040,10 @@ void cmGlobalXCodeGenerator for(unsigned int i = 0; i < this->CurrentConfigurationTypes.size(); ++i) { const char* name = this->CurrentConfigurationTypes[i].c_str(); + if (0 == i) + { + defaultConfigName = name; + } cmXCodeObject* config = this->CreateObject(cmXCodeObject::XCBuildConfiguration); config->AddAttribute("name", this->CreateString(name)); @@ -3060,7 +3065,7 @@ void cmGlobalXCodeGenerator configlist->AddAttribute("defaultConfigurationIsVisible", this->CreateString("0")); configlist->AddAttribute("defaultConfigurationName", - this->CreateString("Debug")); + this->CreateString(defaultConfigName)); cmXCodeObject* buildSettings = this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP); const char* osxArch = |