[Cmake-commits] CMake branch, master, updated. v2.8.12-642-ge313d39

[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, master has been updated
       via  e313d397cd621960c57a2231b1eceeac72f20ac7 (commit)
       via  a1b9465bf85621f80f02b9903aa7b38a74676df1 (commit)
      from  177f5e51d2a73202b44acfd8e26312c1480ffdd7 (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=e313d397cd621960c57a2231b1eceeac72f20ac7
commit e313d397cd621960c57a2231b1eceeac72f20ac7
Merge: 177f5e5 a1b9465
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 5 13:32:15 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 5 13:32:15 2013 -0500

    Merge topic 'fix-automoc-compile-definitions'
    
    a1b9465 Automoc: Add directory-level COMPILE_DEFINITIONS to command line (#14535)

diff --cc Source/cmGlobalGenerator.cxx
index dd7311e,f940c9e..ea17afa
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@@ -1103,9 -956,11 +1103,11 @@@ void cmGlobalGenerator::Generate(
      return;
      }
  
+   this->FinalizeTargetCompileDefinitions();
+ 
    // Iterate through all targets and set up automoc for those which have
 -  // the AUTOMOC property set
 -  this->CreateAutomocTargets();
 +  // the AUTOMOC, AUTOUIC or AUTORCC property set
 +  this->CreateQtAutoGeneratorsTargets();
  
    // For each existing cmLocalGenerator
    unsigned int i;
@@@ -1344,9 -1177,27 +1343,26 @@@ void cmGlobalGenerator::FinalizeTargetC
                            mf->GetProperty(defPropName.c_str()));
          }
        }
+     }
+ }
+ 
+ //----------------------------------------------------------------------------
+ void cmGlobalGenerator::CreateGeneratorTargets()
+ {
+   // Construct per-target generator information.
+   for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
+     {
+     cmGeneratorTargetsType generatorTargets;
+ 
+     cmMakefile *mf = this->LocalGenerators[i]->GetMakefile();
  
+     cmTargets& targets = mf->GetTargets();
+     for(cmTargets::iterator ti = targets.begin();
+         ti != targets.end(); ++ti)
+       {
+       cmTarget* t = &ti->second;
        cmGeneratorTarget* gt = new cmGeneratorTarget(t);
        this->GeneratorTargets[t] = gt;
 -      this->ComputeTargetObjects(gt);
        generatorTargets[t] = gt;
        }
  
diff --cc Source/cmGlobalGenerator.h
index 4d6e10f,80916ae..92c3096
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@@ -395,11 -382,8 +395,12 @@@ private
  
    void WriteSummary();
    void WriteSummary(cmTarget* target);
+   void FinalizeTargetCompileDefinitions();
  
 +  virtual void PrintCompilerAdvice(std::ostream& os, std::string lang,
 +                                   const char* envVar);
 +  void CheckCompilerIdCompatibility(cmMakefile* mf, std::string lang);
 +
    cmExternalMakefileProjectGenerator* ExtraGenerator;
  
    // track files replaced during a Generate

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

Summary of changes:
 Source/cmGlobalGenerator.cxx |   24 ++++++++++++++++++++----
 Source/cmGlobalGenerator.h   |    1 +
 Tests/QtAutogen/foo.h        |    5 ++++-
 3 files changed, 25 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake