[Cmake-commits] CMake branch, next, updated. v2.8.12-4186-g0d9c91f

Stephen Kelly steveire at gmail.com
Sat Oct 19 11:46:17 EDT 2013


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  0d9c91f449bd744bb7662b6227e719ea80fdc91b (commit)
       via  cd8b8cb304cfabf50facffeb208942bfca0c9d98 (commit)
      from  644e016780484da5cb71a6e78c634f542b352417 (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=0d9c91f449bd744bb7662b6227e719ea80fdc91b
commit 0d9c91f449bd744bb7662b6227e719ea80fdc91b
Merge: 644e016 cd8b8cb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 19 11:46:16 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 19 11:46:16 2013 -0400

    Merge topic 'INTERFACE_LIBRARY-build-targets' into next
    
    cd8b8cb Clear the depends info for INTERFACE_LIBRARY targets.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd8b8cb304cfabf50facffeb208942bfca0c9d98
commit cd8b8cb304cfabf50facffeb208942bfca0c9d98
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 19 17:30:19 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 19 17:46:09 2013 +0200

    Clear the depends info for INTERFACE_LIBRARY targets.
    
    It contains a /clean entry for the previous target in the loop.

diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 9c8468a..3a261e2 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -771,9 +771,11 @@ cmGlobalUnixMakefileGenerator3
         progressDir += t->first;
         lg->AppendEcho(commands,progressDir.c_str());
         }
-
+      else
+        {
+        depends.clear();
+        }
       this->AppendGlobalTargetDepends(depends,t->second);
-
       lg->WriteMakeRule(ruleFileStream, "All Build rule for target.",
                         localName.c_str(), depends, commands, true);
 

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

Summary of changes:


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list