diff options
| author | Brad King <brad.king@kitware.com> | 2013-07-26 13:01:19 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-07-26 13:01:19 (GMT) |
| commit | dda6e9366688332e592f5d269bf93f9732151d4d (patch) | |
| tree | 70e4b6e14137d48631b25249d84a93b40c5fdd66 /Tests/ExportImport | |
| parent | c82b1cbe83d8738815fb741432f03533c033a236 (diff) | |
| parent | d777b8e7167e0c1a3de4ebcf66fac5fc604f1dd9 (diff) | |
| download | CMake-dda6e9366688332e592f5d269bf93f9732151d4d.zip CMake-dda6e9366688332e592f5d269bf93f9732151d4d.tar.gz CMake-dda6e9366688332e592f5d269bf93f9732151d4d.tar.bz2 | |
Merge topic 'install-interface-relative'
d777b8e Genex: Allow relative paths in INSTALL_INTERFACE.
Diffstat (limited to 'Tests/ExportImport')
| -rw-r--r-- | Tests/ExportImport/Export/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Tests/ExportImport/Import/A/deps_iface.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt index 787856f..49f1c58 100644 --- a/Tests/ExportImport/Export/CMakeLists.txt +++ b/Tests/ExportImport/Export/CMakeLists.txt @@ -140,6 +140,12 @@ install(FILES ) add_include_lib(testLibIncludeRequired6) +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/testLibIncludeRequired7/testLibIncludeRequired7.h" "// No content\n") +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/testLibIncludeRequired7/testLibIncludeRequired7.h" + DESTINATION include/testLibIncludeRequired7 +) + set_property(TARGET testLibRequired APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:testLibIncludeRequired1,INTERFACE_INCLUDE_DIRECTORIES> @@ -154,6 +160,7 @@ set_property(TARGET testLibRequired APPEND PROPERTY $<BUILD_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired5,INTERFACE_INCLUDE_DIRECTORIES>> # Test that the below is non-fatal $<$<STREQUAL:one,two>:$<TARGET_PROPERTY:not_a_target,INTERFACE_INCLUDE_DIRECTORIES>> + $<INSTALL_INTERFACE:include/testLibIncludeRequired7> ) set_property(TARGET testLibRequired APPEND PROPERTY diff --git a/Tests/ExportImport/Import/A/deps_iface.c b/Tests/ExportImport/Import/A/deps_iface.c index d9dc331..48a4c44 100644 --- a/Tests/ExportImport/Import/A/deps_iface.c +++ b/Tests/ExportImport/Import/A/deps_iface.c @@ -2,6 +2,7 @@ #include "testLibIncludeRequired1.h" #include "testLibIncludeRequired2.h" #include "testLibIncludeRequired6.h" +#include "testLibIncludeRequired7.h" #include "installIncludesTest.h" #include "installIncludesTest2.h" |