[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3027-g2a3cc37

[Stephen Kelly]

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  2a3cc37f3956ab45cafeb8b5331f0cb7c3f74be3 (commit)
       via  9bdc840c12a29192cd6415ee4a50bde8eca9e1ce (commit)
       via  e494348dd1d818c842c80735769c295b552b8c56 (commit)
      from  e27437ac077f7757c41802258dc82297fe66c722 (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=2a3cc37f3956ab45cafeb8b5331f0cb7c3f74be3
commit 2a3cc37f3956ab45cafeb8b5331f0cb7c3f74be3
Merge: e27437a 9bdc840
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 11 02:23:27 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 11 02:23:27 2013 -0400

    Merge topic 'compile-defs-debugging' into next
    
    9bdc840 Fix style.
    e494348 Fix build


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9bdc840c12a29192cd6415ee4a50bde8eca9e1ce
commit 9bdc840c12a29192cd6415ee4a50bde8eca9e1ce
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 11 08:22:52 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jul 11 08:22:52 2013 +0200

    Fix style.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index affe417..7cc0aac 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3549,7 +3549,8 @@ void cmTarget::GetCompileDefinitions(std::vector<std::string> &list,
 
   if (!this->Makefile->IsGeneratingBuildSystem())
     {
-    deleteAndClear(this->Internal->CachedLinkInterfaceCompileDefinitionsEntries);
+    deleteAndClear(this->Internal
+                              ->CachedLinkInterfaceCompileDefinitionsEntries);
     }
   else
     {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e494348dd1d818c842c80735769c295b552b8c56
commit e494348dd1d818c842c80735769c295b552b8c56
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 11 08:22:44 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jul 11 08:22:44 2013 +0200

    Fix build

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 91753d5..63de1a5 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1741,8 +1741,9 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     this->AppendDefines(ppDefs, exportMacro);
     }
   cmGeneratorTarget *gtgt = this->GetGeneratorTarget(&target);
-  this->CurrentLocalGenerator->AddCompileDefinitions(ppDefs,
-                                                     &target, configName);
+  std::vector<std::string> targetDefines;
+  target.GetCompileDefinitions(targetDefines, configName);
+  this->AppendDefines(ppDefs, targetDefines);
   buildSettings->AddAttribute
     ("GCC_PREPROCESSOR_DEFINITIONS", ppDefs.CreateList());
 

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |    5 +++--
 Source/cmTarget.cxx               |    3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake