[Cmake-commits] CMake branch, next, updated. v2.8.12-4184-g644e016

[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  644e016780484da5cb71a6e78c634f542b352417 (commit)
       via  f0ba27dfe888cb1f3480201bc20b34b153be9f4c (commit)
       via  0ac6eea7e876457440b0d03f22958d4c13566c83 (commit)
      from  55725c9e77666b61e08ef92f22ddde3c6b1279c0 (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=644e016780484da5cb71a6e78c634f542b352417
commit 644e016780484da5cb71a6e78c634f542b352417
Merge: 55725c9 f0ba27d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 19 11:46:00 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 19 11:46:00 2013 -0400

    Merge topic 'INTERFACE_LIBRARY-build-targets' into next
    
    f0ba27d Clear the depends info for INTERFACE_LIBRARY targets.
    0ac6eea Revert "Revert "Make INTERFACE_LIBRARY targets part of the all target by default.""


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0ba27dfe888cb1f3480201bc20b34b153be9f4c
commit f0ba27dfe888cb1f3480201bc20b34b153be9f4c
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:45:32 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);
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ac6eea7e876457440b0d03f22958d4c13566c83
commit 0ac6eea7e876457440b0d03f22958d4c13566c83
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 19 17:45:26 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 19 17:45:32 2013 +0200

    Revert "Revert "Make INTERFACE_LIBRARY targets part of the all target by default.""
    
    This reverts commit 076044130c98b7458e4de29190d9a2e89fa6a839.

diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 8ee7b44..9c8468a 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -777,17 +777,14 @@ cmGlobalUnixMakefileGenerator3
       lg->WriteMakeRule(ruleFileStream, "All Build rule for target.",
                         localName.c_str(), depends, commands, true);
 
-      if(t->second.GetType() != cmTarget::INTERFACE_LIBRARY)
+      // add the all/all dependency
+      if(!this->IsExcluded(this->LocalGenerators[0], t->second))
         {
-        // add the all/all dependency
-        if(!this->IsExcluded(this->LocalGenerators[0], t->second))
-          {
-          depends.clear();
-          depends.push_back(localName);
-          commands.clear();
-          lg->WriteMakeRule(ruleFileStream, "Include target in all.",
-                            "all", depends, commands, true);
-          }
+        depends.clear();
+        depends.push_back(localName);
+        commands.clear();
+        lg->WriteMakeRule(ruleFileStream, "Include target in all.",
+                          "all", depends, commands, true);
         }
 
       // Write the rule.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index d779cdb..198ce04 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -273,7 +273,6 @@ if(BUILD_TESTING)
       --build-two-config
       ${build_generator_args}
       --build-project InterfaceBuildTargets
-      --build-target iface
       --test-command ${CMAKE_CMAKE_COMMAND} -E touch_nocreate ${InterfaceBuildTargets_libname}
       )
     list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/InterfaceBuildTargets")
diff --git a/Tests/InterfaceBuildTargets/CMakeLists.txt b/Tests/InterfaceBuildTargets/CMakeLists.txt
index 630259d..a00e5d5 100644
--- a/Tests/InterfaceBuildTargets/CMakeLists.txt
+++ b/Tests/InterfaceBuildTargets/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(InterfaceBuildTargets)
 
-add_library(testlib testlib.cxx)
+add_library(testlib EXCLUDE_FROM_ALL testlib.cxx)
 set_property(TARGET testlib PROPERTY PREFIX "")
 if(CMAKE_GENERATOR MATCHES "Borland|Watcom")
   # These librarians add the .lib suffix anyway.

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

Summary of changes:
 Source/cmGlobalUnixMakefileGenerator3.cxx  |   23 +++++++++++------------
 Tests/CMakeLists.txt                       |    1 -
 Tests/InterfaceBuildTargets/CMakeLists.txt |    2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
CMake