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 e57eadbadc7a3c94fd886a1982ca7283f71d4c24 (commit)
via e9a2a677f30a1c13cc0549ca0e55a5d9ab7686eb (commit)
via 20104ab2d82d6cf0aecbc8ea690465d08719fbe7 (commit)
from 25c9360f5c8832d82dfce9fe78e36fd2d8f718ee (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=e57eadbadc7a3c94fd886a1982ca7283f71d4c24
commit e57eadbadc7a3c94fd886a1982ca7283f71d4c24
Merge: 25c9360 e9a2a67
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon May 6 12:44:37 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon May 6 12:44:37 2013 -0400
Merge topic 'fix-per-config-tll-include-dirs' into next
e9a2a67 Test that linking using the debug keyword to tll works.
20104ab Test transitive includes from setting the LINK_LIBRARIES property.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9a2a677f30a1c13cc0549ca0e55a5d9ab7686eb
commit e9a2a677f30a1c13cc0549ca0e55a5d9ab7686eb
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon May 6 18:39:48 2013 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Mon May 6 18:39:48 2013 +0200
Test that linking using the debug keyword to tll works.
diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
index 3881644..2930330 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -114,3 +114,11 @@ endif()
# shortcutting of the evaluation by returning an empty string.
set(_exe_test $<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>)
target_link_libraries(targetC $<$<AND:${_exe_test},${_exe_test}>:depG>)
+
+add_library(libConsumer SHARED empty.cpp)
+# This line causes $<$<CONFIG:Debug>:depA> to be used when
+# determining the include directories for libConsumer based on the
+# interface properties of its LINK_LIBRARIES. Because the above expression
+# evaluates to the empty string in non-Debug cases, ensure that that causes
+# no problems.
+target_link_libraries(libConsumer debug depA)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20104ab2d82d6cf0aecbc8ea690465d08719fbe7
commit 20104ab2d82d6cf0aecbc8ea690465d08719fbe7
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon May 6 18:10:55 2013 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Mon May 6 18:11:56 2013 +0200
Test transitive includes from setting the LINK_LIBRARIES property.
Commit b8259c3d (Centralize maintenance of usage requirement include
directories, 2013-04-29) changed the handling of the property.
Previously setting the property directly instead of via
target_link_libraries would not result in transitive include
directory handling.
diff --git a/Tests/RunCMake/include_directories/DebugIncludes-stderr.txt
b/Tests/RunCMake/include_directories/DebugIncludes-stderr.txt
index 63aec90..71e6456 100644
--- a/Tests/RunCMake/include_directories/DebugIncludes-stderr.txt
+++ b/Tests/RunCMake/include_directories/DebugIncludes-stderr.txt
@@ -42,3 +42,12 @@ CMake Debug Log at DebugIncludes.cmake:30
\(target_link_libraries\):
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
++
+CMake Debug Log at DebugIncludes.cmake:55 \(set_property\):
+ Used includes for target lll:
+
+ \* .*/Tests/RunCMake/include_directories/nine
+ \* .*/Tests/RunCMake/include_directories/ten
+
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/include_directories/DebugIncludes.cmake
b/Tests/RunCMake/include_directories/DebugIncludes.cmake
index de36899..bbc9e46 100644
--- a/Tests/RunCMake/include_directories/DebugIncludes.cmake
+++ b/Tests/RunCMake/include_directories/DebugIncludes.cmake
@@ -45,3 +45,11 @@ function(some_function)
endfunction()
some_function()
+
+add_library(bar "${CMAKE_CURRENT_BINARY_DIR}/DebugIncludes.cpp")
+target_include_directories(bar
+ INTERFACE
+ "${CMAKE_CURRENT_SOURCE_DIR}/nine"
+ "${CMAKE_CURRENT_SOURCE_DIR}/ten"
+)
+set_property(TARGET lll APPEND PROPERTY LINK_LIBRARIES bar)
-----------------------------------------------------------------------
Summary of changes:
.../target_link_libraries/CMakeLists.txt | 8 ++++++++
.../include_directories/DebugIncludes-stderr.txt | 9 +++++++++
.../include_directories/DebugIncludes.cmake | 8 ++++++++
3 files changed, 25 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
