[Cmake-commits] CMake branch, next, updated. v2.8.12-4051-g28d02bb

[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  28d02bbdc66c3f1539322905ae5f14cd9a437b53 (commit)
       via  7d967bfc618f0f95059100267b6037747ff7f338 (commit)
      from  6d9e164be26c4ceb2667accbd6b83a8bafd00938 (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=28d02bbdc66c3f1539322905ae5f14cd9a437b53
commit 28d02bbdc66c3f1539322905ae5f14cd9a437b53
Merge: 6d9e164 7d967bf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 16 10:09:07 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 16 10:09:07 2013 -0400

    Merge topic 'INTERFACE_LIBRARY-build-targets' into next
    
    7d967bf Make INTERFACE_LIBRARY targets part of the all target by default.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d967bfc618f0f95059100267b6037747ff7f338
commit 7d967bfc618f0f95059100267b6037747ff7f338
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 16 13:30:51 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 16 16:03:38 2013 +0200

    Make INTERFACE_LIBRARY targets part of the all target by default.
    
    Test this by building the all target and making the expected library
    EXCLUDE_FROM_ALL.

diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 6713995..bd391f2 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -781,17 +781,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 d1ff7c7..2733993 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  |   17 +++++++----------
 Tests/CMakeLists.txt                       |    1 -
 Tests/InterfaceBuildTargets/CMakeLists.txt |    2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake