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

chore(3p/nix): export library headers to include/ in output.

Browse source 
Change-Id: I87eb6e59782d720015d351d8829dc7b8688e01f2
Reviewed-on: https://cl.tvl.fyi/c/depot/+/543
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Luke Granger-Brown 2020-06-21 16:58:01 +01:00 committed by lukegb
parent 1ff26fb8c5
commit a54f155c07
4 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,8 +18,7 @@ FLEX_TARGET(NixLexer lexer.l
ADD_FLEX_BISON_DEPENDENCY(NixLexer NixParser) ADD_FLEX_BISON_DEPENDENCY(NixLexer NixParser)
target_sources(nixexpr set(HEADER_FILES
PUBLIC
attr-path.hh attr-path.hh
attr-set.hh attr-set.hh
common-eval-args.hh common-eval-args.hh
@ -35,6 +34,11 @@ target_sources(nixexpr
value.hh value.hh
value-to-json.hh value-to-json.hh
value-to-xml.hh value-to-xml.hh
)
target_sources(nixexpr
PUBLIC
${HEADER_FILES}
PRIVATE PRIVATE
${PROJECT_BINARY_DIR}/generated/parser-tab.hh ${PROJECT_BINARY_DIR}/generated/parser-tab.hh
@ -72,4 +76,5 @@ target_link_libraries(nixexpr
gccpp gccpp
) )
INSTALL(FILES ${HEADER_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nix/libexpr)
INSTALL(TARGETS nixexpr DESTINATION lib) INSTALL(TARGETS nixexpr DESTINATION lib)

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

@ -4,10 +4,14 @@ set_property(TARGET nixmain PROPERTY CXX_STANDARD 17)
include_directories(${PROJECT_BINARY_DIR}) # for config.h include_directories(${PROJECT_BINARY_DIR}) # for config.h
target_include_directories(nixmain PUBLIC "${nix_SOURCE_DIR}/src") target_include_directories(nixmain PUBLIC "${nix_SOURCE_DIR}/src")
target_sources(nixmain set(HEADER_FILES
PUBLIC
common-args.hh common-args.hh
shared.hh shared.hh
)
target_sources(nixmain
PUBLIC
${HEADER_FILES}
PRIVATE PRIVATE
common-args.cc common-args.cc
shared.cc shared.cc
@ -22,4 +26,5 @@ target_link_libraries(nixmain
glog glog
) )
INSTALL(FILES ${HEADER_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nix/libmain)
INSTALL(TARGETS nixmain DESTINATION lib) INSTALL(TARGETS nixmain DESTINATION lib)

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

@ -19,8 +19,7 @@ string(CONFIGURE
file(WRITE ${PROJECT_BINARY_DIR}/generated/schema.sql.hh ${NIX_SCHEMA_GEN}) file(WRITE ${PROJECT_BINARY_DIR}/generated/schema.sql.hh ${NIX_SCHEMA_GEN})
target_sources(nixstore set(HEADER_FILES
PUBLIC
binary-cache-store.hh binary-cache-store.hh
builtins.hh builtins.hh
crypto.hh crypto.hh
@ -46,6 +45,11 @@ target_sources(nixstore
ssh.hh ssh.hh
store-api.hh store-api.hh
worker-protocol.hh worker-protocol.hh
)
target_sources(nixstore
PUBLIC
${HEADER_FILES}
PRIVATE PRIVATE
${PROJECT_BINARY_DIR}/generated/schema.sql.hh ${PROJECT_BINARY_DIR}/generated/schema.sql.hh
@ -99,4 +103,5 @@ target_link_libraries(nixstore
sodium sodium
) )
INSTALL(FILES ${HEADER_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nix/libstore)
INSTALL(TARGETS nixstore DESTINATION lib) INSTALL(TARGETS nixstore DESTINATION lib)

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

@ -4,8 +4,7 @@ set_property(TARGET nixutil PROPERTY CXX_STANDARD 17)
include_directories(${PROJECT_BINARY_DIR}) # for config.h include_directories(${PROJECT_BINARY_DIR}) # for config.h
target_compile_features(nixutil PUBLIC cxx_std_17) target_compile_features(nixutil PUBLIC cxx_std_17)
target_sources(nixutil set(HEADER_FILES
PUBLIC
affinity.hh affinity.hh
archive.hh archive.hh
args.hh args.hh
@ -27,6 +26,11 @@ target_sources(nixutil
types.hh types.hh
util.hh util.hh
xml-writer.hh xml-writer.hh
)
target_sources(nixutil
PUBLIC
${HEADER_FILES}
PRIVATE PRIVATE
affinity.cc affinity.cc
@ -50,4 +54,5 @@ target_link_libraries(nixutil
# Install header files to include/libutil and mark them for automatic # Install header files to include/libutil and mark them for automatic
# inclusion in targets that link to this one. # inclusion in targets that link to this one.
target_include_directories(nixutil PUBLIC "${nix_SOURCE_DIR}/src") 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 lib)