[Cmake-commits] CMake branch, next, updated. v2.8.12-4053-g7b90706

[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  7b90706f34c1b5e6598283524bf1b6c4df84a93a (commit)
       via  8efb85f2f75998c689d8a2ad61c1fef0c8b4ebdc (commit)
      from  28d02bbdc66c3f1539322905ae5f14cd9a437b53 (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=7b90706f34c1b5e6598283524bf1b6c4df84a93a
commit 7b90706f34c1b5e6598283524bf1b6c4df84a93a
Merge: 28d02bb 8efb85f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 16 10:41:43 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 16 10:41:43 2013 -0400

    Merge topic 'INTERFACE_LIBRARY-build-targets' into next
    
    8efb85f Revert "Make INTERFACE_LIBRARY targets part of the all target by default."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8efb85f2f75998c689d8a2ad61c1fef0c8b4ebdc
commit 8efb85f2f75998c689d8a2ad61c1fef0c8b4ebdc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 16 16:39:39 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Oct 16 16:41:07 2013 +0200

    Revert "Make INTERFACE_LIBRARY targets part of the all target by default."
    
    This fails in the InterfaceLibrary and CompatibleInterface tests
    for a reason I can not understand.
    
    This reverts commit 7d967bfc618f0f95059100267b6037747ff7f338.

diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index bd391f2..6713995 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -781,14 +781,17 @@ cmGlobalUnixMakefileGenerator3
       lg->WriteMakeRule(ruleFileStream, "All Build rule for target.",
                         localName.c_str(), depends, commands, true);
 
-      // add the all/all dependency
-      if(!this->IsExcluded(this->LocalGenerators[0], t->second))
+      if(t->second.GetType() != cmTarget::INTERFACE_LIBRARY)
         {
-        depends.clear();
-        depends.push_back(localName);
-        commands.clear();
-        lg->WriteMakeRule(ruleFileStream, "Include target in all.",
-                          "all", depends, commands, true);
+        // 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);
+          }
         }
 
       // Write the rule.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 2733993..d1ff7c7 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -273,6 +273,7 @@ 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 a00e5d5..630259d 100644
--- a/Tests/InterfaceBuildTargets/CMakeLists.txt
+++ b/Tests/InterfaceBuildTargets/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(InterfaceBuildTargets)
 
-add_library(testlib EXCLUDE_FROM_ALL testlib.cxx)
+add_library(testlib 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, 12 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake