diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-07-31 14:40:35 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-07-31 22:37:25 (GMT) |
| commit | 80e652f5cc279715ff57e1c64c6e5c460b201db4 (patch) | |
| tree | 20456816f757b0d5e1386041f17f0b9fc5990f04 /Tests/ExportImport | |
| parent | 43558156d451b605bb9a3d14d53a3896ea98d73a (diff) | |
| download | CMake-80e652f5cc279715ff57e1c64c6e5c460b201db4.zip CMake-80e652f5cc279715ff57e1c64c6e5c460b201db4.tar.gz CMake-80e652f5cc279715ff57e1c64c6e5c460b201db4.tar.bz2 | |
Export: Process generator expressions from INCLUDES DESTINATION.
Configuration sensitive expressions are not permitted.
Diffstat (limited to 'Tests/ExportImport')
| -rw-r--r-- | Tests/ExportImport/Export/CMakeLists.txt | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt index 1910f8c..b5b2027 100644 --- a/Tests/ExportImport/Export/CMakeLists.txt +++ b/Tests/ExportImport/Export/CMakeLists.txt @@ -99,7 +99,6 @@ macro(add_include_lib _libName) set_property(TARGET ${_libName} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/${_libName}>" - "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/${_libName}>" ) if (NOT "${ARGV1}" STREQUAL "NO_HEADER") file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${_libName}/${_libName}.h" "// no content\n") @@ -188,8 +187,7 @@ install(FILES DESTINATION include/testSharedLibRequired ) set_property(TARGET testSharedLibRequired APPEND PROPERTY - INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/testSharedLibRequired>" - "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}>" + INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}>" ) set_property(TARGET testSharedLibRequired APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS USING_TESTSHAREDLIBREQUIRED @@ -273,18 +271,24 @@ set_property(TARGET cmp0022OLD APPEND PROPERTY LINK_INTERFACE_LIBRARIES testLib3 add_library(noIncludesInterface empty.cpp) install(TARGETS testLibRequired - testLibIncludeRequired1 - testLibIncludeRequired2 - testLibIncludeRequired3 - testLibIncludeRequired4 - testLibIncludeRequired5 - testLibIncludeRequired6 - testSharedLibRequired - noIncludesInterface EXPORT RequiredExp DESTINATION lib INCLUDES DESTINATION installIncludesTest - $<INSTALL_PREFIX>/installIncludesTest2) + $<INSTALL_PREFIX>/installIncludesTest2 + ) +install(TARGETS + testLibIncludeRequired1 + testLibIncludeRequired2 + testLibIncludeRequired3 + testLibIncludeRequired4 + testLibIncludeRequired5 + testLibIncludeRequired6 + testSharedLibRequired + noIncludesInterface + EXPORT RequiredExp DESTINATION lib + INCLUDES DESTINATION + $<INSTALL_PREFIX>/include/$<TARGET_PROPERTY:NAME> +) install(EXPORT RequiredExp NAMESPACE Req:: FILE testLibRequiredTargets.cmake DESTINATION lib/cmake/testLibRequired) file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/installIncludesTest") |