[Cmake-commits] CMake branch, next, updated. v2.8.12-4197-g3d63217

[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  3d63217d93e1f9aee8084836415faad9aaa6f88d (commit)
       via  ff1a03680bc1dcf2294789ad041b8717b91e6b51 (commit)
      from  c86761aa864d0db1bc03edac220e6244f9e8f76b (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=3d63217d93e1f9aee8084836415faad9aaa6f88d
commit 3d63217d93e1f9aee8084836415faad9aaa6f88d
Merge: c86761a ff1a036
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 20 08:57:18 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Oct 20 08:57:18 2013 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff1a03680bc1dcf2294789ad041b8717b91e6b51
commit ff1a03680bc1dcf2294789ad041b8717b91e6b51
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 16 13:30:51 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Oct 20 14:56:35 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..ce95c08 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -771,23 +771,26 @@ cmGlobalUnixMakefileGenerator3
         progressDir += t->first;
         lg->AppendEcho(commands,progressDir.c_str());
         }
-
+      else
+        {
+        depends.clear();
+        }
       this->AppendGlobalTargetDepends(depends,t->second);
-
+      if(depends.empty() && this->EmptyRuleHackDepends != "")
+        {
+        depends.push_back(this->EmptyRuleHackDepends);
+        }
       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:


hooks/post-receive
-- 
CMake