diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-02-12 10:56:58 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-02-13 14:12:31 (GMT) |
| commit | 3df36b5954bef70891a666756d325e8bb4d01c1a (patch) | |
| tree | 055c8c03e49569ecb9319c3628ad23ca8017cfe3 /Tests/CMakeCommands | |
| parent | e1f908015f943ed507063260b3aae1f3b503237e (diff) | |
| download | CMake-3df36b5954bef70891a666756d325e8bb4d01c1a.zip CMake-3df36b5954bef70891a666756d325e8bb4d01c1a.tar.gz CMake-3df36b5954bef70891a666756d325e8bb4d01c1a.tar.bz2 | |
Revert "Add the $<LINKED:...> generator expression."
This reverts commit 0b92602b816e2584db3781b120a1e5200da72ada.
Conflicts:
Source/cmGeneratorExpressionEvaluator.cxx
Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt
Tests/CMakeCommands/target_include_directories/CMakeLists.txt
Diffstat (limited to 'Tests/CMakeCommands')
4 files changed, 0 insertions, 23 deletions
diff --git a/Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt b/Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt index 8fed4ca..8a4437b 100644 --- a/Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt +++ b/Tests/CMakeCommands/target_compile_definitions/CMakeLists.txt @@ -16,15 +16,9 @@ add_executable(consumer "${CMAKE_CURRENT_SOURCE_DIR}/consumer.cpp" ) -add_library(linked UNKNOWN IMPORTED) -set_property(TARGET linked PROPERTY - INTERFACE_COMPILE_DEFINITIONS "MY_LINKED_DEFINE") - - target_compile_definitions(consumer PRIVATE $<TARGET_PROPERTY:target_compile_definitions,INTERFACE_COMPILE_DEFINITIONS> $<$<TARGET_DEFINED:notdefined>:SHOULD_NOT_BE_DEFINED> $<$<TARGET_DEFINED:target_compile_definitions>:SHOULD_BE_DEFINED> - $<TARGET_PROPERTY:linked,INTERFACE_COMPILE_DEFINITIONS> -DDASH_D_DEFINE ) diff --git a/Tests/CMakeCommands/target_compile_definitions/consumer.cpp b/Tests/CMakeCommands/target_compile_definitions/consumer.cpp index c077593..1a46aa5 100644 --- a/Tests/CMakeCommands/target_compile_definitions/consumer.cpp +++ b/Tests/CMakeCommands/target_compile_definitions/consumer.cpp @@ -23,8 +23,4 @@ #error Expected DASH_D_DEFINE #endif -#ifndef MY_LINKED_DEFINE -#error Expected MY_LINKED_DEFINE -#endif - int main() { return 0; } diff --git a/Tests/CMakeCommands/target_include_directories/CMakeLists.txt b/Tests/CMakeCommands/target_include_directories/CMakeLists.txt index 2c2ca42..c2da175 100644 --- a/Tests/CMakeCommands/target_include_directories/CMakeLists.txt +++ b/Tests/CMakeCommands/target_include_directories/CMakeLists.txt @@ -17,9 +17,6 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/poison/common.h" "#error Should not be i file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/cure") file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cure/common.h" "#define CURE_DEFINE\n") -file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/linkedinclude") -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/linkedinclude/linkedinclude.h" "#define LINKEDINCLUDE_DEFINE\n") - add_executable(target_include_directories "${CMAKE_CURRENT_SOURCE_DIR}/main.cpp" ) @@ -45,13 +42,8 @@ add_executable(consumer "${CMAKE_CURRENT_SOURCE_DIR}/consumer.cpp" ) -add_library(linked UNKNOWN IMPORTED) -set_property(TARGET linked PROPERTY - INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/linkedinclude") - target_include_directories(consumer PRIVATE $<TARGET_PROPERTY:target_include_directories,INTERFACE_INCLUDE_DIRECTORIES> - $<TARGET_PROPERTY:linked,INTERFACE_INCLUDE_DIRECTORIES> relative_dir ) diff --git a/Tests/CMakeCommands/target_include_directories/consumer.cpp b/Tests/CMakeCommands/target_include_directories/consumer.cpp index ccffd9c..82b800a 100644 --- a/Tests/CMakeCommands/target_include_directories/consumer.cpp +++ b/Tests/CMakeCommands/target_include_directories/consumer.cpp @@ -3,7 +3,6 @@ #include "publicinclude.h" #include "interfaceinclude.h" #include "relative_dir.h" -#include "linkedinclude.h" #ifdef PRIVATEINCLUDE_DEFINE #error Unexpected PRIVATEINCLUDE_DEFINE @@ -25,8 +24,4 @@ #error Expected RELATIVE_DIR_DEFINE #endif -#ifndef LINKEDINCLUDE_DEFINE -#error Expected LINKEDINCLUDE_DEFINE -#endif - int main() { return 0; } |