[Cmake-commits] CMake branch, next, updated. v2.8.7-3391-g6a80dd5

David Cole david.cole at kitware.com
Mon Apr 2 15:58:30 EDT 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6a80dd5e0707e781b6637cddb93f6025f4f86778 (commit)
       via  0579fa045c854b732506887cdf3a9a54610748ab (commit)
      from  4008d9c99bd56571da012ce1831632484558ac94 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a80dd5e0707e781b6637cddb93f6025f4f86778
commit 6a80dd5e0707e781b6637cddb93f6025f4f86778
Merge: 4008d9c 0579fa0
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Apr 2 15:58:29 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 2 15:58:29 2012 -0400

    Merge topic 'fix-13082-use-config-0' into next
    
    0579fa0 Xcode: Pay attention to custom configuration types (#13082)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0579fa045c854b732506887cdf3a9a54610748ab
commit 0579fa045c854b732506887cdf3a9a54610748ab
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Apr 2 15:50:37 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Apr 2 15:50:37 2012 -0400

    Xcode: Pay attention to custom configuration types (#13082)
    
    Previously, we were setting the default configuration for a generated
    Xcode project to the hard-coded string "Debug" even in cases where users
    customized their configuration types such that the list did not contain
    "Debug". Now, we use the first string listed in CMAKE_CONFIGURATION_TYPES
    as the default config for generated Xcode projects.

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 =

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list