[cmake] add kalman format target path to installation

Author: FrancoisCarouge

CMakeLists.txt

@@ -49,6 +49,7 @@ set(CPACK_PACKAGE_CHECKSUM "SHA512")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt")
 
+include(CMakePackageConfigHelpers)
 include(CPack)
 include(CTest)
 include(FetchContent)

benchmark/CMakeLists.txt

@@ -42,8 +42,7 @@ foreach(BENCHMARK "baseline.cpp" "predict_1x1x0.cpp" "predict_1x1x1.cpp"
                   "update_1x1x0.cpp" "update_1x1x1.cpp")
   get_filename_component(NAME ${BENCHMARK} NAME_WE)
   add_executable(kalman_benchmark_${NAME}_driver ${BENCHMARK})
-  target_include_directories(kalman_benchmark_${NAME}_driver PRIVATE "."
-                                                                     "include")
+  target_include_directories(kalman_benchmark_${NAME}_driver PRIVATE "include")
   target_link_libraries(
     kalman_benchmark_${NAME}_driver PRIVATE benchmark::benchmark
                                             benchmark::benchmark_main kalman)
@@ -60,7 +59,7 @@ foreach(STATE_SIZE RANGE 1 2)
     add_executable(kalman_benchmark_${NAME}_driver
                    eigen_update_${STATE_SIZE}x${OUTPUT_SIZE}x0.cpp)
     target_include_directories(kalman_benchmark_${NAME}_driver
-                               PRIVATE "." "include")
+                               PRIVATE "include")
     target_link_libraries(
       kalman_benchmark_${NAME}_driver
       PRIVATE benchmark::benchmark benchmark::benchmark_main Eigen3::Eigen
@@ -76,7 +75,7 @@ foreach(STATE_SIZE RANGE 1 2)
     add_executable(kalman_benchmark_${NAME}_driver
                    eigen_predict_${STATE_SIZE}x1x${INPUT_SIZE}.cpp)
     target_include_directories(kalman_benchmark_${NAME}_driver
-                               PRIVATE "." "include")
+                               PRIVATE "include")
     target_link_libraries(
       kalman_benchmark_${NAME}_driver
       PRIVATE benchmark::benchmark benchmark::benchmark_main Eigen3::Eigen

cmake/CMakeLists.txt

@@ -36,21 +36,19 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 For more information, please refer to <https://unlicense.org> ]]
 
-include(CMakePackageConfigHelpers)
-
 configure_package_config_file(
-  "KalmanConfig.cmake.in" "KalmanConfig.cmake"
-  INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/Kalman/cmake"
+  "kalman-config.cmake.in" "kalman-config.cmake"
+  INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/kalman/cmake"
   NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO)
 
 write_basic_package_version_file(
-  "KalmanConfigVersion.cmake" COMPATIBILITY SameMajorVersion ARCH_INDEPENDENT)
+  "kalman-config-version.cmake" COMPATIBILITY SameMajorVersion ARCH_INDEPENDENT)
 
 install(
-  EXPORT KalmanTargets
+  EXPORT kalmanTargets
   NAMESPACE kalman::
-  DESTINATION "${CMAKE_INSTALL_DATADIR}/Kalman/cmake")
+  DESTINATION "${CMAKE_INSTALL_DATADIR}/kalman/cmake")
 
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KalmanConfig.cmake"
-              "${CMAKE_CURRENT_BINARY_DIR}/KalmanConfigVersion.cmake"
-        DESTINATION "${CMAKE_INSTALL_DATADIR}/Kalman/cmake")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kalman-config.cmake"
+              "${CMAKE_CURRENT_BINARY_DIR}/kalman-config-version.cmake"
+        DESTINATION "${CMAKE_INSTALL_DATADIR}/kalman/cmake")

cmake/KalmanConfig.cmake.in cmake/kalman-config.cmake.in

@@ -36,6 +36,4 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 For more information, please refer to <https://unlicense.org> ]]
 
-@PACKAGE_INIT@
-
-include("${CMAKE_CURRENT_LIST_DIR}/KalmanTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/kalmanTargets.cmake")

include/CMakeLists.txt

@@ -39,7 +39,6 @@ For more information, please refer to <https://unlicense.org> ]]
 if(WIN32)
   set(OPTIONS "/EHsc" "/W4")
 else()
-  set(LIBRARIES kalman_format)
   set(OPTIONS
       "-ansi"
       "-fno-check-new"
@@ -79,16 +78,13 @@ target_sources(
             "fcarouge/kalman.hpp")
 target_compile_options(kalman INTERFACE ${OPTIONS})
 target_compile_features(kalman INTERFACE cxx_std_23)
-target_link_libraries(kalman INTERFACE ${LIBRARIES})
-
+target_link_libraries(kalman INTERFACE kalman_format)
 install(
   TARGETS kalman
-  EXPORT KalmanTargets
-  FILE_SET "kalman_headers")
-
-export(PACKAGE kalman)
-
-export(
-  TARGETS kalman
+  EXPORT kalmanTargets
+  FILE_SET "kalman_headers"
+  DESTINATION "include/fcarouge")
+install(
+  EXPORT kalmanTargets
   NAMESPACE kalman::
-  FILE "KalmanTargets.cmake")
+  DESTINATION "${CMAKE_INSTALL_DATADIR}/kalman/cmake")

pkgconfig/kalman.pc.in

@@ -1,9 +1,7 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
 
-Name: Kalman
+Name: kalman
 Description: Kalman Filter for C++.
-Requires:
 Version: @CMAKE_PROJECT_VERSION@
-Libs:
-Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@
+Cflags: -I${includedir}

support/CMakeLists.txt

@@ -42,17 +42,20 @@ if(WIN32)
   # and should be replaced with a check for the compiler library support.
 else()
   add_library(kalman_format INTERFACE)
-  target_sources(kalman_format INTERFACE FILE_SET "format_headers" TYPE
+  target_sources(kalman_format INTERFACE FILE_SET "kalman_format_headers" TYPE
                                          "HEADERS" FILES "format")
   target_link_libraries(kalman_format INTERFACE fmt::fmt)
+  # target_include_directories( kalman_format INTERFACE
+  # "$<$<NOT:$<BOOL:${WIN32}>>:INSTALL_INTERFACE:${CMAKE_INSTALL_DIR}/include/fcarouge>"
+  # )
   install(
     TARGETS kalman_format
-    EXPORT KalmanTargets
-    FILE_SET "format_headers"
+    EXPORT kalmanTargets
+    FILE_SET "kalman_format_headers"
     DESTINATION "include/fcarouge"
     ARCHIVE DESTINATION "lib/fcarouge")
-  export(
-    TARGETS kalman_format
+  install(
+    EXPORT kalmanTargets
     NAMESPACE kalman::
-    FILE "KalmanTargets.cmake")
+    DESTINATION "${CMAKE_INSTALL_DATADIR}/kalman/cmake")
 endif()