summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-02-12 10:58:50 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-02-13 14:12:31 (GMT)
commite1f908015f943ed507063260b3aae1f3b503237e (patch)
tree32643d048d7a5fe48062d2a21df2deda4be90ce8 /Tests/RunCMake
parent567c8d103ed3c3cb7303877d89e8508dd3f8d0ca (diff)
downloadCMake-e1f908015f943ed507063260b3aae1f3b503237e.zip
CMake-e1f908015f943ed507063260b3aae1f3b503237e.tar.gz
CMake-e1f908015f943ed507063260b3aae1f3b503237e.tar.bz2
Don't populate INTERFACE includes and defines properties in tll.
This is a partial revert of commit 77cecb77 (Add includes and compile definitions with target_link_libraries., 2012-11-05). As the interface includes and defines are now determined by the link closure, there is no need to populate the corresponding properties explicitly.
Diffstat (limited to 'Tests/RunCMake')
-rw-r--r--Tests/RunCMake/include_directories/DebugIncludes-stderr.txt13
-rw-r--r--Tests/RunCMake/include_directories/DebugIncludes.cmake6
2 files changed, 12 insertions, 7 deletions
diff --git a/Tests/RunCMake/include_directories/DebugIncludes-stderr.txt b/Tests/RunCMake/include_directories/DebugIncludes-stderr.txt
index c17e0ae..63aec90 100644
--- a/Tests/RunCMake/include_directories/DebugIncludes-stderr.txt
+++ b/Tests/RunCMake/include_directories/DebugIncludes-stderr.txt
@@ -23,21 +23,22 @@ CMake Debug Log at DebugIncludes.cmake:18 \(include_directories\):
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
+
-CMake Debug Log at DebugIncludes.cmake:26 \(target_link_libraries\):
+CMake Debug Log at DebugIncludes.cmake:33 \(set_property\):
Used includes for target lll:
\* .*/Tests/RunCMake/include_directories/five
+ \* .*/Tests/RunCMake/include_directories/six
+ \* .*/Tests/RunCMake/include_directories/seven
Call Stack \(most recent call first\):
+ DebugIncludes.cmake:44 \(some_macro\)
+ DebugIncludes.cmake:47 \(some_function\)
CMakeLists.txt:3 \(include\)
+
-CMake Debug Log at DebugIncludes.cmake:29 \(set_property\):
+CMake Debug Log at DebugIncludes.cmake:30 \(target_link_libraries\):
Used includes for target lll:
- \* .*/Tests/RunCMake/include_directories/six
- \* .*/Tests/RunCMake/include_directories/seven
+ \* .*/Tests/RunCMake/include_directories/eight
Call Stack \(most recent call first\):
- DebugIncludes.cmake:40 \(some_macro\)
- DebugIncludes.cmake:43 \(some_function\)
CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/include_directories/DebugIncludes.cmake b/Tests/RunCMake/include_directories/DebugIncludes.cmake
index 794a852..de36899 100644
--- a/Tests/RunCMake/include_directories/DebugIncludes.cmake
+++ b/Tests/RunCMake/include_directories/DebugIncludes.cmake
@@ -22,7 +22,11 @@ include_directories(
)
add_library(foo "${CMAKE_CURRENT_BINARY_DIR}/DebugIncludes.cpp")
-target_include_directories(foo INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/five")
+target_include_directories(foo
+ INTERFACE
+ "${CMAKE_CURRENT_SOURCE_DIR}/seven"
+ "${CMAKE_CURRENT_SOURCE_DIR}/eight"
+)
target_link_libraries(lll foo)
macro(some_macro)