use filesets

Author: PacificViking

CMake/ystdlib-cpp-helpers.cmake

@@ -96,17 +96,8 @@ function(cpp_library)
         endif()
         add_library(${arg_cpp_lib_NAME} INTERFACE)
         target_link_libraries(${arg_cpp_lib_NAME} INTERFACE ${arg_cpp_lib_PUBLIC_LINK_LIBRARIES})
-        target_include_directories(
-            ${arg_cpp_lib_NAME}
-            INTERFACE
-                "$<BUILD_INTERFACE:${arg_cpp_lib_BUILD_INCLUDE_DIR}>"
-        )
-        target_compile_features(${arg_cpp_lib_NAME} INTERFACE cxx_std_20)
 
-        # tells where headers are
-        target_include_directories(${arg_cpp_lib_NAME} INTERFACE 
-            # "$<INSTALL_INTERFACE:include/${arg_cpp_lib_NAME}>")
-            "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
+        target_compile_features(${arg_cpp_lib_NAME} INTERFACE cxx_std_20)
 
     else()
         # The library type is specified by `BUILD_SHARED_LIBS` if it is defined. Otherwise, the type
@@ -125,22 +116,22 @@ function(cpp_library)
             PRIVATE
                 ${arg_cpp_lib_PRIVATE_LINK_LIBRARIES}
         )
-        target_include_directories(
-            ${arg_cpp_lib_NAME}
-            PUBLIC
-                "$<BUILD_INTERFACE:${arg_cpp_lib_BUILD_INCLUDE_DIR}>"
-        )
         target_compile_features(${arg_cpp_lib_NAME} PUBLIC cxx_std_20)
     endif()
 
     add_library(${_ALIAS_TARGET_NAME} ALIAS ${arg_cpp_lib_NAME})
 
-    # install headers
-    set(INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/ystdlib/${arg_cpp_lib_NAME}")
-    install(
+    # replaces header_include_directories
+    # replaces header installation
+    target_sources(
+        ${arg_cpp_lib_NAME}
+        PUBLIC
+        FILE_SET HEADERS
+        BASE_DIRS
+            "$<BUILD_INTERFACE:${arg_cpp_lib_BUILD_INCLUDE_DIR}>"
+            "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
         FILES
-        ${arg_cpp_lib_PUBLIC_HEADERS}
-        DESTINATION "${INSTALL_INCLUDE_DIR}"
+            ${arg_cpp_lib_PUBLIC_HEADERS}
     )
 
     set_target_properties(

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.22.1)
+cmake_minimum_required(VERSION 3.23)
 
 set(ystdlib_VERSION "0.0.1" CACHE STRING "Project version.")
 
@@ -89,17 +89,25 @@ set(ystdlib_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR})
 
 add_subdirectory(src/ystdlib)
 
-install(TARGETS
-    containers
-    error_handling
-    io_interface
-    wrapped_facade_headers
-    EXPORT ystdlib-targets
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        # FILE_SET HEADERS
-)
+set(ystdlib_targets
+        containers
+        error_handling
+        io_interface
+        wrapped_facade_headers)
+
+foreach(install_target_name IN LISTS ystdlib_targets)
+
+    install(TARGETS
+        ${install_target_name}
+        EXPORT ystdlib-targets
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+            FILE_SET HEADERS
+    )
+
+endforeach()
+
 
 install(EXPORT ystdlib-targets NAMESPACE ystdlib:: DESTINATION ${ystdlib_INSTALL_CONFIG_DIR})