diff options
| author | Luke Granger-Brown <hg@lukegb.com> | 2020-06-21T16·20+0100 |
|---|---|---|
| committer | lukegb <lukegb@tvl.fyi> | 2020-06-21T20·42+0000 |
| commit | 739a45f9e47f35680117af61dc1a3aa2f5615636 (patch) | |
| tree | b5c9f1884bfbe033e5648f5557e06db6e26a472c /third_party | |
| parent | a54f155c0715b42cdee0485200658075fb6cf173 (diff) | |
chore(3p/nix): use GNUInstallDirs to determine output directory names r/1051
This ensures that we install both glog's .a and all the .so files we generate into a single consistent output lib path (which is, err, lib64, but whatever). Change-Id: Ib6ac6eacf5f56e4b719cfb586db731efc122c31b Reviewed-on: https://cl.tvl.fyi/c/depot/+/544 Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/nix/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | third_party/nix/src/libexpr/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | third_party/nix/src/libmain/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | third_party/nix/src/libstore/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | third_party/nix/src/libutil/CMakeLists.txt | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/third_party/nix/CMakeLists.txt b/third_party/nix/CMakeLists.txt index 012a63bcb927..24de6824de45 100644 --- a/third_party/nix/CMakeLists.txt +++ b/third_party/nix/CMakeLists.txt @@ -7,6 +7,9 @@ set(CMAKE_CXX_STANDARD 17) # clangd and clang-tidy. set(CMAKE_EXPORT_COMPILE_COMMANDS ON) +# Provide an output path for pkgconfig. +include(GNUInstallDirs) + # The following lines import CMake-native dependencies which may # contain useful definitions. Other dependencies are not treated # specially by CMake and are only linked into the resulting binary. diff --git a/third_party/nix/src/libexpr/CMakeLists.txt b/third_party/nix/src/libexpr/CMakeLists.txt index d85cb24c81cd..4be3fc5475ea 100644 --- a/third_party/nix/src/libexpr/CMakeLists.txt +++ b/third_party/nix/src/libexpr/CMakeLists.txt @@ -77,4 +77,4 @@ target_link_libraries(nixexpr ) INSTALL(FILES ${HEADER_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nix/libexpr) -INSTALL(TARGETS nixexpr DESTINATION lib) +INSTALL(TARGETS nixexpr DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/third_party/nix/src/libmain/CMakeLists.txt b/third_party/nix/src/libmain/CMakeLists.txt index a4ba48d7087b..2520c85cc50a 100644 --- a/third_party/nix/src/libmain/CMakeLists.txt +++ b/third_party/nix/src/libmain/CMakeLists.txt @@ -27,4 +27,4 @@ target_link_libraries(nixmain ) INSTALL(FILES ${HEADER_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nix/libmain) -INSTALL(TARGETS nixmain DESTINATION lib) +INSTALL(TARGETS nixmain DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/third_party/nix/src/libstore/CMakeLists.txt b/third_party/nix/src/libstore/CMakeLists.txt index a7b0ea60fff2..7661e44e07d6 100644 --- a/third_party/nix/src/libstore/CMakeLists.txt +++ b/third_party/nix/src/libstore/CMakeLists.txt @@ -104,4 +104,4 @@ target_link_libraries(nixstore ) INSTALL(FILES ${HEADER_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nix/libstore) -INSTALL(TARGETS nixstore DESTINATION lib) +INSTALL(TARGETS nixstore DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/third_party/nix/src/libutil/CMakeLists.txt b/third_party/nix/src/libutil/CMakeLists.txt index 395671e07c8c..43b9e8525f78 100644 --- a/third_party/nix/src/libutil/CMakeLists.txt +++ b/third_party/nix/src/libutil/CMakeLists.txt @@ -55,4 +55,4 @@ target_link_libraries(nixutil # inclusion in targets that link to this one. target_include_directories(nixutil PUBLIC "${nix_SOURCE_DIR}/src") INSTALL(FILES ${HEADER_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nix/libutil) -INSTALL(TARGETS nixutil DESTINATION lib) +INSTALL(TARGETS nixutil DESTINATION ${CMAKE_INSTALL_LIBDIR}) |