[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3555-ge68bde6

[Brad King]

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  e68bde6755ace31d53acca30bbd71a45deba7115 (commit)
       via  23dc6aa1949180925444c32534ac3f6f6e2c3351 (commit)
      from  54d35d4588f5784b20610b4c175cd3dd40dbf12b (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=e68bde6755ace31d53acca30bbd71a45deba7115
commit e68bde6755ace31d53acca30bbd71a45deba7115
Merge: 54d35d4 23dc6aa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 5 09:42:33 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 5 09:42:33 2014 -0400

    Merge topic 'xcode-15-string-apis' into next
    
    23dc6aa1 Xcode: Fix single-configuration generation for version 1.5


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23dc6aa1949180925444c32534ac3f6f6e2c3351
commit 23dc6aa1949180925444c32534ac3f6f6e2c3351
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 5 09:11:00 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 5 09:43:13 2014 -0400

    Xcode: Fix single-configuration generation for version 1.5
    
    In commit 84fdc992 (stringapi: Pass configuration names as strings,
    2014-02-09) a few code paths for the Xcode 1.5 single-configuration
    generator were not updated to use an empty configuration name instead of
    a NULL pointer when no configuration is specified in CMAKE_BUILD_TYPE.
    Fix them now.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index e5fc436..dbc3937 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2442,8 +2442,8 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
     }
   else
     {
-    const char* theConfig =
-      this->CurrentMakefile->GetDefinition("CMAKE_BUILD_TYPE");
+    std::string theConfig =
+      this->CurrentMakefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
     cmXCodeObject* buildSettings =
       this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
     this->CreateBuildSettings(cmtarget, buildSettings, theConfig);
@@ -2821,11 +2821,7 @@ void cmGlobalXCodeGenerator
       i != this->CurrentConfigurationTypes.end(); ++i)
     {
     // Get the current configuration name.
-    const char* configName = i->c_str();
-    if(!*configName)
-      {
-      configName = 0;
-      }
+    std::string configName = *i;
 
     if(this->XcodeVersion >= 50)
       {
@@ -3512,11 +3508,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
         ct = this->CurrentConfigurationTypes.begin();
       ct != this->CurrentConfigurationTypes.end(); ++ct)
     {
-    const char* configName = 0;
-    if(!ct->empty())
-      {
-      configName = ct->c_str();
-      }
+    std::string configName = *ct;
     for(std::vector<cmXCodeObject*>::iterator i = targets.begin();
         i != targets.end(); ++i)
       {
@@ -3969,7 +3961,7 @@ bool cmGlobalXCodeGenerator::IsMultiConfig()
 void cmGlobalXCodeGenerator
 ::ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const
 {
-  const char* configName = this->GetCMakeCFGIntDir();
+  std::string configName = this->GetCMakeCFGIntDir();
   std::string dir = this->GetObjectsNormalDirectory(
     "$(PROJECT_NAME)", configName, gt->Target);
   if(this->XcodeVersion >= 21)

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |   18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake