diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-07-25 07:05:03 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-07-25 12:31:22 (GMT) |
| commit | d777b8e7167e0c1a3de4ebcf66fac5fc604f1dd9 (patch) | |
| tree | 87801670e241b12f64697f02c974b72458f90670 /Tests | |
| parent | 650e61f833c2cc3ace8405a22eb80a10cfc6187c (diff) | |
| download | CMake-d777b8e7167e0c1a3de4ebcf66fac5fc604f1dd9.zip CMake-d777b8e7167e0c1a3de4ebcf66fac5fc604f1dd9.tar.gz CMake-d777b8e7167e0c1a3de4ebcf66fac5fc604f1dd9.tar.bz2 | |
Genex: Allow relative paths in INSTALL_INTERFACE.
These paths can be prepended with the ${_IMPORT_PREFIX} generated
in the export file.
Such relative paths were previously an error.
Diffstat (limited to 'Tests')
| -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 737ec43..8772555 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" |