diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-05 09:54:20 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-05 09:54:20 -0400 |
| commit | d3c8688ecdcdcea89373af2d6a30c4ba66315465 (patch) | |
| tree | 827f12a133ab4d91edd09103a86e83e9505d59e1 /Tests | |
| parent | aa025cc60a56da31dfe8461faec0dc3aa517cc10 (diff) | |
| parent | 5b222354de7060af409d0d80aa06180ed1b3ac64 (diff) | |
| download | cmake-d3c8688ecdcdcea89373af2d6a30c4ba66315465.tar.gz | |
Merge topic 'fix-genex-HEAD-target'
5b22235 Genex: Fix the HEAD target used for evaluated expressions
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt index 088725b07a..6919261043 100644 --- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt +++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt @@ -109,6 +109,11 @@ set_property(TARGET libbad APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/bad" ) +add_library(lib6 SHARED other.cpp) +add_library(lib7 SHARED other.cpp) +target_link_libraries(lib7 $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:lib6>) +target_include_directories(lib7 PUBLIC $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:/lib7/include>) +add_custom_target(head_target_test "some_bogus_custom_tool \"$<TARGET_PROPERTY:lib7,INCLUDE_DIRECTORIES>$<TARGET_PROPERTY:lib7,INTERFACE_INCLUDE_DIRECTORIES>\"") add_library(includes_source_good empty.cpp) target_include_directories(includes_source_good diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp b/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp new file mode 100644 index 0000000000..6673471b5f --- /dev/null +++ b/Tests/IncludeDirectories/TargetIncludeDirectories/other.cpp @@ -0,0 +1,6 @@ +#ifdef _WIN32 +__declspec(dllexport) +#endif +int other() { + return 0; +} |