[Cmake-commits] CMake branch, next, updated. v2.8.3-903-g72ffe93

Brad King brad.king at kitware.com
Wed Dec 15 11:32:29 EST 2010


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  72ffe937885d9ca86be5b35040ead88fa85396c9 (commit)
       via  3e279971fb81cb3c810b35869ad335d50a98c4ab (commit)
      from  bc76a36141c5580105be02a965c3a84856b0733d (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=72ffe937885d9ca86be5b35040ead88fa85396c9
commit 72ffe937885d9ca86be5b35040ead88fa85396c9
Merge: bc76a36 3e27997
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 15 11:32:23 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 15 11:32:23 2010 -0500

    Merge topic 'link-depend-def-file' into next
    
    3e27997 Make link rule depend on ".def" file (#11014)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e279971fb81cb3c810b35869ad335d50a98c4ab
commit 3e279971fb81cb3c810b35869ad335d50a98c4ab
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 15 11:30:57 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 15 11:30:57 2010 -0500

    Make link rule depend on ".def" file (#11014)
    
    When the link command line references a ".def" file the rule should
    depend on it.
    
    Inspired-By: Eric Huhtala

diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 969cfdb..cf19ce6 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1527,6 +1527,12 @@ void cmMakefileTargetGenerator
   this->LocalGenerator->AppendRuleDepend(depends,
                                          this->BuildFileNameFull.c_str());
 
+  // Add a dependency on the link definitions file, if any.
+  if(!this->ModuleDefinitionFile.empty())
+    {
+    depends.push_back(this->ModuleDefinitionFile);
+    }
+
   // Add dependencies on the external object files.
   for(std::vector<std::string>::const_iterator obj
         = this->ExternalObjects.begin();

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list