From a54f155c0715b42cdee0485200658075fb6cf173 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sun, 21 Jun 2020 16:58:01 +0100
Subject: chore(3p/nix): export library headers to include/ in output.

Change-Id: I87eb6e59782d720015d351d8829dc7b8688e01f2
Reviewed-on: https://cl.tvl.fyi/c/depot/+/543
Reviewed-by: tazjin <mail@tazj.in>
---
 third_party/nix/src/libexpr/CMakeLists.txt  | 9 +++++++--
 third_party/nix/src/libmain/CMakeLists.txt  | 9 +++++++--
 third_party/nix/src/libstore/CMakeLists.txt | 9 +++++++--
 third_party/nix/src/libutil/CMakeLists.txt  | 9 +++++++--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/third_party/nix/src/libexpr/CMakeLists.txt b/third_party/nix/src/libexpr/CMakeLists.txt
index 3456052ea9dd..d85cb24c81cd 100644
--- a/third_party/nix/src/libexpr/CMakeLists.txt
+++ b/third_party/nix/src/libexpr/CMakeLists.txt
@@ -18,8 +18,7 @@ FLEX_TARGET(NixLexer lexer.l
 
 ADD_FLEX_BISON_DEPENDENCY(NixLexer NixParser)
 
-target_sources(nixexpr
-  PUBLIC
+set(HEADER_FILES
     attr-path.hh
     attr-set.hh
     common-eval-args.hh
@@ -35,6 +34,11 @@ target_sources(nixexpr
     value.hh
     value-to-json.hh
     value-to-xml.hh
+)
+
+target_sources(nixexpr
+  PUBLIC
+    ${HEADER_FILES}
 
   PRIVATE
     ${PROJECT_BINARY_DIR}/generated/parser-tab.hh
@@ -72,4 +76,5 @@ target_link_libraries(nixexpr
   gccpp
 )
 
+INSTALL(FILES ${HEADER_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nix/libexpr)
 INSTALL(TARGETS nixexpr DESTINATION lib)
diff --git a/third_party/nix/src/libmain/CMakeLists.txt b/third_party/nix/src/libmain/CMakeLists.txt
index 825e8ee5d666..a4ba48d7087b 100644
--- a/third_party/nix/src/libmain/CMakeLists.txt
+++ b/third_party/nix/src/libmain/CMakeLists.txt
@@ -4,10 +4,14 @@ set_property(TARGET nixmain PROPERTY CXX_STANDARD 17)
 include_directories(${PROJECT_BINARY_DIR}) # for config.h
 target_include_directories(nixmain PUBLIC "${nix_SOURCE_DIR}/src")
 
-target_sources(nixmain
-  PUBLIC
+set(HEADER_FILES
     common-args.hh
     shared.hh
+)
+
+target_sources(nixmain
+  PUBLIC
+    ${HEADER_FILES}
   PRIVATE
     common-args.cc
     shared.cc
@@ -22,4 +26,5 @@ target_link_libraries(nixmain
   glog
 )
 
+INSTALL(FILES ${HEADER_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nix/libmain)
 INSTALL(TARGETS nixmain DESTINATION lib)
diff --git a/third_party/nix/src/libstore/CMakeLists.txt b/third_party/nix/src/libstore/CMakeLists.txt
index 21adb0fb02e5..a7b0ea60fff2 100644
--- a/third_party/nix/src/libstore/CMakeLists.txt
+++ b/third_party/nix/src/libstore/CMakeLists.txt
@@ -19,8 +19,7 @@ string(CONFIGURE
 
 file(WRITE ${PROJECT_BINARY_DIR}/generated/schema.sql.hh ${NIX_SCHEMA_GEN})
 
-target_sources(nixstore
-  PUBLIC
+set(HEADER_FILES
     binary-cache-store.hh
     builtins.hh
     crypto.hh
@@ -46,6 +45,11 @@ target_sources(nixstore
     ssh.hh
     store-api.hh
     worker-protocol.hh
+)
+
+target_sources(nixstore
+  PUBLIC
+    ${HEADER_FILES}
 
   PRIVATE
     ${PROJECT_BINARY_DIR}/generated/schema.sql.hh
@@ -99,4 +103,5 @@ target_link_libraries(nixstore
   sodium
 )
 
+INSTALL(FILES ${HEADER_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nix/libstore)
 INSTALL(TARGETS nixstore DESTINATION lib)
diff --git a/third_party/nix/src/libutil/CMakeLists.txt b/third_party/nix/src/libutil/CMakeLists.txt
index 2aa513a39549..395671e07c8c 100644
--- a/third_party/nix/src/libutil/CMakeLists.txt
+++ b/third_party/nix/src/libutil/CMakeLists.txt
@@ -4,8 +4,7 @@ set_property(TARGET nixutil PROPERTY CXX_STANDARD 17)
 include_directories(${PROJECT_BINARY_DIR}) # for config.h
 target_compile_features(nixutil PUBLIC cxx_std_17)
 
-target_sources(nixutil
-  PUBLIC
+set(HEADER_FILES
     affinity.hh
     archive.hh
     args.hh
@@ -27,6 +26,11 @@ target_sources(nixutil
     types.hh
     util.hh
     xml-writer.hh
+)
+
+target_sources(nixutil
+  PUBLIC
+    ${HEADER_FILES}
 
   PRIVATE
     affinity.cc
@@ -50,4 +54,5 @@ target_link_libraries(nixutil
 # Install header files to include/libutil and mark them for automatic
 # 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)
-- 
cgit 1.4.1