diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-04-04 13:13:19 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-08-18 15:33:35 -0400 |
| commit | f7a33090a91015836497c75f173775392ab0304d (patch) | |
| tree | 89ff558da243a70b58ccfe7f405e9e92deaf18f5 /pstl | |
| parent | 8a10ee7590a91c9b2e5c80b52822a3a4c3af1a15 (diff) | |
| download | llvm-f7a33090a91015836497c75f173775392ab0304d.tar.gz | |
[cmake] Use `CMAKE_INSTALL_LIBDIR` too
We held off on this before as `LLVM_LIBDIR_SUFFIX` conflicted with it.
Now we return this.
`LLVM_LIBDIR_SUFFIX` is kept as a deprecated way to set
`CMAKE_INSTALL_LIBDIR`. The other `*_LIBDIR_SUFFIX` are just removed
entirely.
I imagine this is too potentially-breaking to make LLVM 15. That's fine.
I have a more minimal version of this in the disto (NixOS) patches for
LLVM 15 (like previous versions). This more expansive version I will
test harder after the release is cut.
Reviewed By: sebastian-ne, ldionne, #libc, #libc_abi
Differential Revision: https://reviews.llvm.org/D130586
Diffstat (limited to 'pstl')
| -rw-r--r-- | pstl/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pstl/CMakeLists.txt b/pstl/CMakeLists.txt index 2461522349ee..60b080da144f 100644 --- a/pstl/CMakeLists.txt +++ b/pstl/CMakeLists.txt @@ -88,10 +88,10 @@ install(TARGETS ParallelSTL install(EXPORT ParallelSTLTargets FILE ParallelSTLTargets.cmake NAMESPACE pstl:: - DESTINATION lib/cmake/ParallelSTL) + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ParallelSTL") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfigVersion.cmake" - DESTINATION lib/cmake/ParallelSTL) + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ParallelSTL") install(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" PATTERN "*.in" EXCLUDE) |