[Cmake-commits] CMake branch, next, updated. v2.8.3-1336-g84ba082

[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  84ba082054f7997d9aaeee88988e1ad8cf91908f (commit)
       via  809ef3086d27a79d25c53680e738ceb7bb9b18fc (commit)
      from  667146e3a2e94b0d7af5802f3b2f007b632b0b2f (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=84ba082054f7997d9aaeee88988e1ad8cf91908f
commit 84ba082054f7997d9aaeee88988e1ad8cf91908f
Merge: 667146e 809ef30
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 13 12:15:55 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 13 12:15:55 2011 -0500

    Merge topic 'xcode-subdir-regen-dependencies' into next
    
    809ef30 Xcode: Make generation depend on all input directories


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=809ef3086d27a79d25c53680e738ceb7bb9b18fc
commit 809ef3086d27a79d25c53680e738ceb7bb9b18fc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 13 12:07:23 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 13 12:07:23 2011 -0500

    Xcode: Make generation depend on all input directories
    
    Previously the Xcode generator would rerun CMake only if input file
    dependencies in the top-level directory changed.  Teach it to depend on
    input files from all directories.  Other generators already do this.
    
    Reported-by: Johan Björk <phb at spotify.com>

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 59ca38f..012dd9e 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -355,7 +355,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
   cmCustomCommandLines commandLines;
   commandLines.push_back(makecommand);
   // Add Re-Run CMake rules
-  this->CreateReRunCMakeFile(root);
+  this->CreateReRunCMakeFile(root, gens);
 
   // now make the allbuild depend on all the non-utility targets
   // in the project
@@ -403,10 +403,18 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalXCodeGenerator::CreateReRunCMakeFile(cmLocalGenerator* root)
+void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
+  cmLocalGenerator* root, std::vector<cmLocalGenerator*> const& gens)
 {
   cmMakefile* mf = root->GetMakefile();
-  std::vector<std::string> lfiles = mf->GetListFiles();
+  std::vector<std::string> lfiles;
+  for(std::vector<cmLocalGenerator*>::const_iterator gi = gens.begin();
+      gi != gens.end(); ++gi)
+    {
+    std::vector<std::string> const& lf = (*gi)->GetMakefile()->GetListFiles();
+    lfiles.insert(lfiles.end(), lf.begin(), lf.end());
+    }
+
   // sort the array
   std::sort(lfiles.begin(), lfiles.end(), std::less<std::string>());
   std::vector<std::string>::iterator new_end =
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index b4de805..290532a 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -171,7 +171,8 @@ private:
                                   const char* name2,
                                   cmTarget& cmtarget,
                                   const std::vector<cmCustomCommand>&);
-  void CreateReRunCMakeFile(cmLocalGenerator* root);
+  void CreateReRunCMakeFile(cmLocalGenerator* root,
+                            std::vector<cmLocalGenerator*> const& gens);
 
   std::string LookupFlags(const char* varNamePrefix,
                           const char* varNameLang,

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |   14 +++++++++++---
 Source/cmGlobalXCodeGenerator.h   |    3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake