[Cmake-commits] CMake branch, next, updated. v2.8.12-4103-g1c0079e

[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  1c0079ec950f3ebf1aee03756656e3d1b46b3054 (commit)
       via  37348f9fec60a6ecbd85cab1ba9efc23d8185470 (commit)
      from  158ca0cd2e5c3de104026e5551cd2abcada77664 (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=1c0079ec950f3ebf1aee03756656e3d1b46b3054
commit 1c0079ec950f3ebf1aee03756656e3d1b46b3054
Merge: 158ca0c 37348f9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 17 13:24:16 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 17 13:24:16 2013 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37348f9fec60a6ecbd85cab1ba9efc23d8185470
commit 37348f9fec60a6ecbd85cab1ba9efc23d8185470
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:52:28 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 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  |   17 +++++++----------
 Tests/CMakeLists.txt                       |    1 -
 Tests/InterfaceBuildTargets/CMakeLists.txt |    2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake