diff options
| author | Philip Pfaffe <philip.pfaffe@gmail.com> | 2018-11-06 15:18:17 +0000 |
|---|---|---|
| committer | Philip Pfaffe <philip.pfaffe@gmail.com> | 2018-11-06 15:18:17 +0000 |
| commit | ebcb2eaf33387fe4204bd587e47f4ce16aeb4215 (patch) | |
| tree | 06e2d484b8851edd3e74ea5a20127c1c4bc9a5cd /polly | |
| parent | caf586b40c8b4a877a0df5be293a39bcb12cc99e (diff) | |
[CMake] Fix generation of exported targets in build directory
CMake generates the exports file wrongly if the CMAKE_BUILD_TYPE is
unset for multi-configuration generators.
The generated file lib/cmake/polly/PollyExports-all.cmake then contains:
set_target_properties(LLVMPolly PROPERTIES
IMPORTED_LOCATION_ my_build_dir/lib/LLVMPolly.so)
set_target_properties(Polly PROPERTIES
IMPORTED_LOCATION_ my_build_dir/lib/libPolly.a)
This patch conditionalizes the underscore.
Patch by: Marcin Copik
Differential Revision: D53376
Diffstat (limited to 'polly')
| -rw-r--r-- | polly/cmake/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/polly/cmake/CMakeLists.txt b/polly/cmake/CMakeLists.txt index 969292cd6b0..211f9551271 100644 --- a/polly/cmake/CMakeLists.txt +++ b/polly/cmake/CMakeLists.txt @@ -60,7 +60,7 @@ foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") set(POLLY_EXPORTS "set_target_properties(${tgt} PROPERTIES - IMPORTED_LOCATION_$<UPPER_CASE:$<CONFIG>> $<TARGET_FILE:${tgt}>) + IMPORTED_LOCATION$<$<NOT:$<CONFIG:>>:_$<UPPER_CASE:$<CONFIG>>> $<TARGET_FILE:${tgt}>) ${POLLY_EXPORTS}") endif() endforeach(tgt) @@ -111,7 +111,7 @@ foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") set(POLLY_EXPORTS "set_target_properties(${tgt} PROPERTIES - IMPORTED_LOCATION$<$<NOT:$<CONFIG:>>:_<UPPER_CASE:$<CONFIG>> \${CMAKE_CURRENT_LIST_DIR}/${tgt_path}) + IMPORTED_LOCATION$<$<NOT:$<CONFIG:>>:_$<UPPER_CASE:$<CONFIG>>> \${CMAKE_CURRENT_LIST_DIR}/${tgt_path}) ${POLLY_EXPORTS}") endif() endforeach(tgt) |