From 728815ee0f1d8eca91cc49309e48a6beaee09979 Mon Sep 17 00:00:00 2001 From: FrancoisCarouge Date: Sat, 14 Jan 2023 19:44:32 -0800 Subject: [PATCH] [cmake] rename target file consistency --- cmake/CMakeLists.txt | 4 ++-- cmake/kalman-config.cmake.in | 2 +- include/CMakeLists.txt | 9 ++++----- support/CMakeLists.txt | 6 +++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index c8bd99ac1..d17d289d3 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -45,8 +45,8 @@ write_basic_package_version_file( "kalman-config-version.cmake" COMPATIBILITY SameMajorVersion ARCH_INDEPENDENT) install( - EXPORT kalmanTargets - NAMESPACE kalman:: + EXPORT "kalman-target" + NAMESPACE "kalman::" DESTINATION "${CMAKE_INSTALL_DATADIR}/kalman/cmake") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kalman-config.cmake" diff --git a/cmake/kalman-config.cmake.in b/cmake/kalman-config.cmake.in index eaa7ea065..2241fe0f5 100644 --- a/cmake/kalman-config.cmake.in +++ b/cmake/kalman-config.cmake.in @@ -36,4 +36,4 @@ OTHER DEALINGS IN THE SOFTWARE. For more information, please refer to ]] -include("${CMAKE_CURRENT_LIST_DIR}/kalmanTargets.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/kalman-target.cmake") diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index a8eaa5da8..69827446b 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -84,12 +84,11 @@ target_compile_features(kalman INTERFACE cxx_std_23) target_link_libraries(kalman INTERFACE $<$>:kalman_format>) install( TARGETS kalman - EXPORT kalmanTargets - FILE_SET "kalman_headers" - DESTINATION "include") + EXPORT "kalman-target" + FILE_SET "kalman_headers") install( - EXPORT kalmanTargets - NAMESPACE kalman:: + EXPORT "kalman-target" + NAMESPACE "kalman::" DESTINATION "${CMAKE_INSTALL_DATADIR}/kalman/cmake") # Conditionally provide the namespace alias target which may be an imported diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt index b66c89bec..fd3131e29 100644 --- a/support/CMakeLists.txt +++ b/support/CMakeLists.txt @@ -47,11 +47,11 @@ else() target_link_libraries(kalman_format INTERFACE fmt::fmt) install( TARGETS kalman_format - EXPORT kalmanTargets + EXPORT "kalman-target" FILE_SET "kalman_format_headers" DESTINATION "include/fcarouge") install( - EXPORT kalmanTargets - NAMESPACE kalman:: + EXPORT "kalman-target" + NAMESPACE "kalman::" DESTINATION "${CMAKE_INSTALL_DATADIR}/kalman/cmake") endif()