Fix header installation

Author: TheAssassin

CMakeLists.txt

@@ -62,9 +62,9 @@ execute_process(
 
 # config.h contains some global defines, our config.h.in is a modified version of the upstream config.h.in to make it
 # integrate with CMake
-configure_file(src/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+configure_file(src/config.h.in ${PROJECT_BINARY_DIR}/config.h)
 # since there's headers in the build directory now, include that as well
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${PROJECT_BINARY_DIR})
 
 # find out which platform we're building for
 if(UNIX)

cmake/export.cmake

@@ -2,13 +2,6 @@
 cmake_minimum_required(VERSION 3.15)
 set(CMP0090 NEW)
 
-# set up installion of exported targets (consider libzsync2 a namespace for use in CMake)
-install(
-    TARGETS libzsync2
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    EXPORT libzsync2
-)
-
 # allow import from current build tree
 export(
     TARGETS libzsync2
@@ -20,7 +13,7 @@ export(
 # note that the targets must be install(... EXPORT zsync) in order for this to work (consider libzsync2 a namespace)
 install(
     EXPORT libzsync2
-    DESTINATION lib/cmake/zsync2
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zsync2
 )
 
 include(CMakePackageConfigHelpers)
@@ -42,5 +35,5 @@ write_basic_package_version_file(
 install(FILES
     "${PROJECT_BINARY_DIR}/cmake/zsync2Config.cmake"
     "${PROJECT_BINARY_DIR}/cmake/zsync2ConfigVersion.cmake"
-    DESTINATION lib/cmake/zsync2
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zsync2
 )

src/CMakeLists.txt

@@ -6,6 +6,13 @@ set(CMAKE_POSITION_INDEPENDENT_CODE true)
 # fix CPR target
 target_include_directories(cpr PUBLIC ${CPR_INCLUDE_DIRS})
 
+set(zsync2_public_headers
+    ${PROJECT_SOURCE_DIR}/include/zsutil.h
+    ${PROJECT_SOURCE_DIR}/include/zsclient.h
+    ${PROJECT_SOURCE_DIR}/include/zsglobal.h
+    ${PROJECT_SOURCE_DIR}/include/zsmake.h
+)
+
 # core library
 add_library(libzsync2 SHARED
     zsclient.cpp
@@ -14,14 +21,14 @@ add_library(libzsync2 SHARED
     zsmake.cpp
     ${ZSYNC2_SRCS} ${ZSYNC2_HDRS}
     format_string.h
-    ${CMAKE_CURRENT_BINARY_DIR}/config.h
-    ${PROJECT_SOURCE_DIR}/include/zsutil.h
-    ${PROJECT_SOURCE_DIR}/include/zsclient.h
-    ${PROJECT_SOURCE_DIR}/include/zsglobal.h
-    ${PROJECT_SOURCE_DIR}/include/zsmake.h
+    ${PROJECT_BINARY_DIR}/config.h
+    ${zsync2_public_headers}
 )
 # since the target is called libsomething, one doesn't need CMake's additional lib prefix
-set_target_properties(libzsync2 PROPERTIES PREFIX "")
+set_target_properties(libzsync2 PROPERTIES
+    PREFIX ""
+    PUBLIC_HEADER "${zsync2_public_headers}"
+)
 target_link_libraries(libzsync2 PRIVATE cpr libzsync hashlib)
 target_include_directories(libzsync2
     PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
@@ -50,9 +57,16 @@ target_link_libraries(zsyncmake2 PRIVATE cpr)
 
 # install targets
 install(
-    TARGETS zsync2 libzsync2 zsyncmake2
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    TARGETS libzsync2
+    EXPORT libzsync2
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    COMPONENT libzsync2
+)
+
+install(
+    TARGETS zsync2 zsyncmake2
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    COMPONENT zsync2
 )