diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2022-01-15 07:37:48 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-01-16 05:33:07 +0000 |
| commit | 4a678f8072004eff9214c1a4e1836a14abb69535 (patch) | |
| tree | b7fe4d6433abb085421540711f6a4b03b85d79e7 /polly/CMakeLists.txt | |
| parent | 1088c78c3b054f73f7d107addd50ee0669bb31be (diff) | |
| download | llvm-4a678f8072004eff9214c1a4e1836a14abb69535.zip llvm-4a678f8072004eff9214c1a4e1836a14abb69535.tar.gz llvm-4a678f8072004eff9214c1a4e1836a14abb69535.tar.bz2 | |
[cmake] Use `GNUInstallDirs` to support custom installation dirs.
This is the original patch in my GNUInstallDirs series, now last to merge as the final piece!
It arose as a new draft of D28234. I initially did the unorthodox thing of pushing to that when I wasn't the original author, but since I ended up
- Using `GNUInstallDirs`, rather than mimicking it, as the original author was hesitant to do but others requested.
- Converting all the packages, not just LLVM, effecting many more projects than LLVM itself.
I figured it was time to make a new revision.
I have used this patch series (and many back-ports) as the basis of https://github.com/NixOS/nixpkgs/pull/111487 for my distro (NixOS), which was merged last spring (2021). It looked like people were generally on board in D28234, but I make note of this here in case extra motivation is useful.
---
As pointed out in the original issue, a central tension is that LLVM already has some partial support for these sorts of things. Variables like `COMPILER_RT_INSTALL_PATH` have already been dealt with. Variables like `LLVM_LIBDIR_SUFFIX` however, will require further work, so that we may use `CMAKE_INSTALL_LIBDIR`.
These remaining items will be addressed in further patches. What is here is now rote and so we should get it out of the way before dealing more intricately with the remainder.
Reviewed By: #libunwind, #libc, #libc_abi, compnerd
Differential Revision: https://reviews.llvm.org/D99484
Diffstat (limited to 'polly/CMakeLists.txt')
| -rw-r--r-- | polly/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/polly/CMakeLists.txt b/polly/CMakeLists.txt index fb62dbd..d6bcc8f 100644 --- a/polly/CMakeLists.txt +++ b/polly/CMakeLists.txt @@ -1,3 +1,5 @@ +include(GNUInstallDirs) + # Check if this is a in tree build. if (NOT DEFINED LLVM_MAIN_SRC_DIR) project(Polly) @@ -124,13 +126,13 @@ include_directories( if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) install(DIRECTORY include/ - DESTINATION include + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" FILES_MATCHING PATTERN "*.h" ) install(DIRECTORY ${POLLY_BINARY_DIR}/include/ - DESTINATION include + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" FILES_MATCHING PATTERN "*.h" PATTERN "CMakeFiles" EXCLUDE |