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 f2e5b8eb908cfb9102612e1ad277da899ac7362d (commit)
via 076044130c98b7458e4de29190d9a2e89fa6a839 (commit)
from 1c0079ec950f3ebf1aee03756656e3d1b46b3054 (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=f2e5b8eb908cfb9102612e1ad277da899ac7362d
commit f2e5b8eb908cfb9102612e1ad277da899ac7362d
Merge: 1c0079e 0760441
Author: Stephen Kelly <[email protected]>
AuthorDate: Thu Oct 17 13:32:35 2013 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Thu Oct 17 13:32:35 2013 -0400
Merge topic 'INTERFACE_LIBRARY-build-targets' into next
0760441 Revert "Make INTERFACE_LIBRARY targets part of the all target by
default."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=076044130c98b7458e4de29190d9a2e89fa6a839
commit 076044130c98b7458e4de29190d9a2e89fa6a839
Author: Stephen Kelly <[email protected]>
AuthorDate: Thu Oct 17 19:32:15 2013 +0200
Commit: Stephen Kelly <[email protected]>
CommitDate: Thu Oct 17 19:32:15 2013 +0200
Revert "Make INTERFACE_LIBRARY targets part of the all target by default."
This reverts commit 37348f9fec60a6ecbd85cab1ba9efc23d8185470.
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx
b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 9c8468a..8ee7b44 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -777,14 +777,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 198ce04..d779cdb 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
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
