diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-07 14:34:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-07 14:34:50 (GMT) |
| commit | 947b02e2e0d0a7d9c8155b50ac79b56818f4b6f6 (patch) | |
| tree | febc2c50a0007b5081398e354de5b7d285c7a29c /Tests | |
| parent | a023a2e4fe289dedd42a883464c9f7514ac0d0e9 (diff) | |
| parent | 3ded5b6da8cb10d855e36d4ea534222ba870d165 (diff) | |
| download | CMake-947b02e2e0d0a7d9c8155b50ac79b56818f4b6f6.zip CMake-947b02e2e0d0a7d9c8155b50ac79b56818f4b6f6.tar.gz CMake-947b02e2e0d0a7d9c8155b50ac79b56818f4b6f6.tar.bz2 | |
Merge topic 'export-genex-under-prefix'
3ded5b6da8 install,export: Fix export of a genex following $<INSTALL_PREFIX>
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3886
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/ExportImport/Export/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt index c6b7dbc..5cf04e8 100644 --- a/Tests/ExportImport/Export/CMakeLists.txt +++ b/Tests/ExportImport/Export/CMakeLists.txt @@ -313,6 +313,8 @@ install(FILES ) cmake_policy(POP) +cmake_policy(PUSH) +cmake_policy(SET CMP0041 NEW) add_library(testSharedLibDepends SHARED testSharedLibDepends.cpp) set_property(TARGET testSharedLibDepends APPEND PROPERTY INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}" @@ -329,9 +331,10 @@ install(FILES DESTINATION include/testSharedLibDepends ) set_property(TARGET testSharedLibDepends APPEND PROPERTY - INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/testSharedLibDepends>" + INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/$<1:include>/testSharedLibDepends>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}>" ) +cmake_policy(POP) # LINK_PRIVATE because the LINK_INTERFACE_LIBRARIES is specified above. target_link_libraries(testSharedLibDepends LINK_PRIVATE testSharedLibRequired) |