Fix CMake export and include interfaces

cpp/CMakeLists.txt

@@ -1,7 +1,12 @@
 cmake_minimum_required(VERSION 3.12.0) # older would work, but could give warnings on policy CMP0074
-project(petsird VERSION 0.7.2)
+project(petsird VERSION 0.7.2 LANGUAGES CXX)
+include(GNUInstallDirs)
+set(PETSIRD_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/PETSIRD")
+
+include(CMakePackageConfigHelpers)
 
 set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if(WIN32)
   add_compile_options(/W3 /WX)
@@ -15,14 +20,71 @@ if(CCACHE_PROGRAM)
   message(STATUS "ccache found, so we will use it.")
 endif()
 
+find_package(date REQUIRED)
+
 # assume that yardl was run with the following in the _package.yml
 #   sourcesOutputDir: ../cpp/generated/petsird
 
 add_subdirectory(generated/petsird)
+add_subdirectory(helpers)
 # create a petsird library target
 # Currently it is just empty, but allows creating target properties which are transitive
 add_library(petsird)
-target_link_libraries(petsird PUBLIC petsird_generated)
-target_include_directories(petsird PUBLIC "${PROJECT_SOURCE_DIR}/generated")
+add_library(PETSIRD::petsird ALIAS petsird)
 
-add_subdirectory(helpers)
+target_link_libraries(petsird
+  PUBLIC
+    petsird_generated
+    petsird_helpers
+    date::date
+)
+
+target_compile_features(petsird PUBLIC cxx_std_17)
+
+target_include_directories(petsird
+  PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/generated>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/helpers/include>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
+install(TARGETS petsird petsird_generated petsird_helpers
+  EXPORT petsirdTargets
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+
+install(
+  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/generated/petsird/
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/petsird
+)
+
+install(
+  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/helpers/include/
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
+install(EXPORT petsirdTargets
+  NAMESPACE PETSIRD::
+  DESTINATION ${PETSIRD_CMAKE_DIR}
+)
+
+
+configure_package_config_file(
+  cmake/PETSIRDConfig.cmake.in
+  ${CMAKE_CURRENT_BINARY_DIR}/PETSIRDConfig.cmake
+  INSTALL_DESTINATION ${PETSIRD_CMAKE_DIR}
+)
+
+write_basic_package_version_file(
+  ${CMAKE_CURRENT_BINARY_DIR}/PETSIRDConfigVersion.cmake
+  VERSION ${PROJECT_VERSION}
+  COMPATIBILITY SameMajorVersion
+)
+
+install(FILES
+  ${CMAKE_CURRENT_BINARY_DIR}/PETSIRDConfig.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/PETSIRDConfigVersion.cmake
+  DESTINATION ${PETSIRD_CMAKE_DIR}
+)

cpp/cmake/PETSIRDConfig.cmake.in

@@ -0,0 +1,12 @@
+@PACKAGE_INIT@
+include(CMakeFindDependencyMacro)
+find_dependency(date)
+find_dependency(BLAS)
+if(@PETSIRD_GENERATED_USE_NDJSON@)
+  find_dependency(nlohmann_json)
+endif()
+if(@PETSIRD_GENERATED_USE_HDF5@)
+  find_dependency(HDF5 COMPONENTS CXX)
+endif()
+include("${CMAKE_CURRENT_LIST_DIR}/petsirdTargets.cmake")
+check_required_components(PETSIRD)

cpp/helpers/CMakeLists.txt

@@ -1,13 +1,33 @@
-find_package(xtensor-blas REQUIRED)
+find_package(xtensor REQUIRED)
+# find_package(xtensor-blas REQUIRED)
+find_package(BLAS REQUIRED)
 
 # create a petsird_helpers library target
 # Currently it is just empty, but allows creating target properties which are transitive
 add_library(petsird_helpers INTERFACE)
-target_link_libraries(petsird_helpers INTERFACE petsird xtensor-blas)
-target_include_directories(petsird_helpers INTERFACE "${PROJECT_SOURCE_DIR}/helpers/include")
+
+target_include_directories(petsird_helpers
+  INTERFACE
+  ${xtensor_INCLUDE_DIRS}
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
+target_link_libraries(petsird_helpers INTERFACE petsird BLAS::BLAS)
 
 add_executable(petsird_generator petsird_generator.cpp)
-target_link_libraries(petsird_generator petsird_helpers)
+target_link_libraries(petsird_generator PRIVATE petsird_helpers)
 
 add_executable(petsird_analysis petsird_analysis.cpp)
-target_link_libraries(petsird_analysis petsird_helpers)
+target_link_libraries(petsird_analysis PRIVATE petsird_helpers)
+
+foreach(t petsird petsird_generated petsird_helpers)
+  if(TARGET ${t})
+    get_target_property(_libs ${t} INTERFACE_LINK_LIBRARIES)
+    if(_libs)
+      list(FILTER _libs EXCLUDE REGEX "xtensor")
+      set_target_properties(${t}
+        PROPERTIES INTERFACE_LINK_LIBRARIES "${_libs}")
+    endif()
+  endif()
+endforeach()