mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p/nix): use GNUInstallDirs to determine output directory names

Browse source 
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>
This commit is contained in:
Luke Granger-Brown 2020-06-21 17:20:59 +01:00 committed by lukegb
parent a54f155c07
commit 739a45f9e4
5 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
third_party/nix/CMakeLists.txt vendored
View file

@ -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.

2
third_party/nix/src/libexpr/CMakeLists.txt vendored
View file

@ -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})

2
third_party/nix/src/libmain/CMakeLists.txt vendored
View file

@ -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})

2
third_party/nix/src/libstore/CMakeLists.txt vendored
View file

@ -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})

2
third_party/nix/src/libutil/CMakeLists.txt vendored
View file

@ -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})