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 3deada4973a175503b6aef1abf8b4c271a7e1660 (commit)
via e7b579bd01690f27c82ee9cbda4b7023f4a3d6c9 (commit)
via 77cecb778ff1882d87401c1055ec06585462f787 (commit)
via 0b92602b816e2584db3781b120a1e5200da72ada (commit)
via 0fa7f69c0e2cdcd8b7ece400651ee7821b2ede4b (commit)
via 2c3654c3de718fe822f8960063373774fc019494 (commit)
via d4297d5697cd10114f8accb7a233aa1f5ebc50ab (commit)
via df4d2b28b24a3172daf1290070199633f7c46cf0 (commit)
via 7ceeba992b4fb35ca05760b3170e68f41dfc1bb5 (commit)
via 30268b46f8237f25c82858693c000f5da8ede6ad (commit)
from dadb32e4da4f7cd39e0b0e7eba1f46659ac3f6a0 (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=3deada4973a175503b6aef1abf8b4c271a7e1660
commit 3deada4973a175503b6aef1abf8b4c271a7e1660
Merge: dadb32e e7b579b
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Thu Jan 31 11:35:07 2013 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Jan 31 11:35:07 2013 -0500
Merge topic 'tll-includes-defines' into next
e7b579b Test workaround of bad interface include directories from depends.
77cecb7 Add includes and compile definitions with target_link_libraries.
0b92602 Add the $LINKED:... generator expression.
0fa7f69 Add API to check if we're reading a includes or defines property.
2c3654c Add a way to exclude INTERFACE properties from exported targets.
d4297d5 Export targets to a targets file, not a Config file.
df4d2b2 Make it an error for INSTALL_PREFIX to be evaluated.
7ceeba9 Advance more when preprocessing exported strings.
30268b4 Handle reading empty properties defined by the link interface.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7b579bd01690f27c82ee9cbda4b7023f4a3d6c9
commit e7b579bd01690f27c82ee9cbda4b7023f4a3d6c9
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Dec 21 18:28:58 2012 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Thu Jan 31 17:34:20 2013 +0100
Test workaround of bad interface include directories from depends.
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index 21159e0..5387377 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@ -82,3 +82,44 @@ add_custom_target(test_custom_target
$TARGET_PROPERTY:TargetIncludeDirectories,COMPILE_DEFINITIONS
WORKING_DIRECTORY
${CMAKE_CURRENT_SOURCE_DIR})
+
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bad)
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bad/common.h #error Should not be
included\n)
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/good)
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/good/common.h #include
\othergood.h\\n)
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/othergood)
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/othergood/othergood.h // No error\n)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libothergood.cpp // No content \n)
+add_library(libothergood ${CMAKE_CURRENT_BINARY_DIR}/libothergood.cpp)
+set_property(TARGET libothergood APPEND PROPERTY
+ INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/othergood
+)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libgood.cpp // No content \n)
+add_library(libgood ${CMAKE_CURRENT_BINARY_DIR}/libgood.cpp)
+set_property(TARGET libgood APPEND PROPERTY
+ INTERFACE_INCLUDE_DIRECTORIES
+
${CMAKE_CURRENT_BINARY_DIR}/good;$TARGET_PROPERTY:libothergood,INTERFACE_INCLUDE_DIRECTORIES
+)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libbad.cpp // No content \n)
+add_library(libbad ${CMAKE_CURRENT_BINARY_DIR}/libbad.cpp)
+set_property(TARGET libbad APPEND PROPERTY
+ INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/bad
+)
+
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp #include \common.h\\n)
+add_library(lib5 ${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp)
+
+# Assuming the link order must be:
+target_link_libraries(lib5 libbad libgood)
+
+# Oops!.
+# As include directory order and link order are the same when using
target_link_libraries, we have to
+# get the libgood includes in before the libbad includes.
+# We do that with this command:
+target_include_directories(lib5
+ BEFORE PRIVATE $LINKED:libgood
+)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77cecb778ff1882d87401c1055ec06585462f787
commit 77cecb778ff1882d87401c1055ec06585462f787
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Nov 5 12:43:28
