From a8cfaa17d399e5fb12e197ef1c09d7ecf37f79b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20Gl=C3=A4ser?= Date: Sun, 16 Mar 2025 19:35:23 +0100 Subject: [PATCH 1/6] [cmake] export targets into build tree --- CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 77ed2019..c7e971fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,6 +152,14 @@ install(FILES DESTINATION lib/cmake/HighFive ) +# export targets into build tree +export( + EXPORT HighFiveTargets + FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/HighFiveTargets.cmake" + NAMESPACE HighFive:: +) + + # Preparing local building (tests, examples) # ------------------------------------------ From ea905e6c09df58acd12518e6274f8605126f47c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20Gl=C3=A4ser?= Date: Sun, 16 Mar 2025 19:42:40 +0100 Subject: [PATCH 2/6] [cmake] place config file in build tree --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c7e971fe..55d2a5d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,6 +134,11 @@ write_basic_package_version_file( VERSION ${PACKAGE_VERSION} COMPATIBILITY AnyNewerVersion ) +configure_package_config_file( + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/HighFiveConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/cmake/HighFiveConfig.cmake + INSTALL_DESTINATION lib/cmake/HighFive +) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION "include" @@ -147,7 +152,7 @@ install(EXPORT HighFiveTargets ) install(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/HighFiveConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/cmake/HighFiveConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmake/HighFiveConfigVersion.cmake DESTINATION lib/cmake/HighFive ) From 29154a2557fff1e1163b67bdb2c1b59b08025aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20Gl=C3=A4ser?= Date: Mon, 17 Mar 2025 08:55:25 +0100 Subject: [PATCH 3/6] [cmake] install config files to cmake_datarootdir --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 55d2a5d7..f65aaaca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,6 +128,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/highfive/H5Version.hpp.in # Install # ------- +include(GNUInstallDirs) include(CMakePackageConfigHelpers) write_basic_package_version_file( ${CMAKE_CURRENT_BINARY_DIR}/cmake/HighFiveConfigVersion.cmake @@ -137,7 +138,7 @@ write_basic_package_version_file( configure_package_config_file( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/HighFiveConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmake/HighFiveConfig.cmake - INSTALL_DESTINATION lib/cmake/HighFive + INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/HighFive/cmake ) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ @@ -148,13 +149,13 @@ install(TARGETS HighFive HighFiveInclude EXPORT HighFiveTargets) install(EXPORT HighFiveTargets FILE HighFiveTargets.cmake NAMESPACE HighFive:: - DESTINATION lib/cmake/HighFive + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/HighFive/cmake ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/HighFiveConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmake/HighFiveConfigVersion.cmake - DESTINATION lib/cmake/HighFive + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/HighFive/cmake ) # export targets into build tree From d0b5be489119848a2e03ff2b9faf4956b911f4c7 Mon Sep 17 00:00:00 2001 From: Luc Grosheintz Date: Wed, 19 Mar 2025 10:11:29 +0100 Subject: [PATCH 4/6] cmake: remove GNUInstallDirs --- CMakeLists.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f65aaaca..4748ce9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,10 @@ mark_as_advanced(HIGHFIVE_HAS_FRIEND_DECLARATIONS) option(HIGHFIVE_FIND_HDF5 "Find and link with HDF5." On) +set(HIGHFIVE_CMAKE_INSTALL_DIR "share/HighFive/cmake" CACHE STRING + "Directory where HighFive's CMake code will be installed. Default: share/HighFive/cmake") + + # Configure Tests & Examples # -------------------------- @@ -128,17 +132,17 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/highfive/H5Version.hpp.in # Install # ------- -include(GNUInstallDirs) include(CMakePackageConfigHelpers) write_basic_package_version_file( ${CMAKE_CURRENT_BINARY_DIR}/cmake/HighFiveConfigVersion.cmake VERSION ${PACKAGE_VERSION} COMPATIBILITY AnyNewerVersion ) + configure_package_config_file( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/HighFiveConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmake/HighFiveConfig.cmake - INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/HighFive/cmake + INSTALL_DESTINATION ${HIGHFIVE_CMAKE_INSTALL_DIR} ) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ @@ -149,13 +153,13 @@ install(TARGETS HighFive HighFiveInclude EXPORT HighFiveTargets) install(EXPORT HighFiveTargets FILE HighFiveTargets.cmake NAMESPACE HighFive:: - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/HighFive/cmake + DESTINATION ${HIGHFIVE_CMAKE_INSTALL_DIR} ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/HighFiveConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmake/HighFiveConfigVersion.cmake - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/HighFive/cmake + DESTINATION ${HIGHFIVE_CMAKE_INSTALL_DIR} ) # export targets into build tree From 903f26a1b579c6bfc18e78006eeae43035f1b1af Mon Sep 17 00:00:00 2001 From: Luc Grosheintz Date: Sat, 22 Mar 2025 12:18:37 +0100 Subject: [PATCH 5/6] cmake: default cmake install dir: lib/cmake/HighFive. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4748ce9f..4f656e07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,8 +37,8 @@ mark_as_advanced(HIGHFIVE_HAS_FRIEND_DECLARATIONS) option(HIGHFIVE_FIND_HDF5 "Find and link with HDF5." On) -set(HIGHFIVE_CMAKE_INSTALL_DIR "share/HighFive/cmake" CACHE STRING - "Directory where HighFive's CMake code will be installed. Default: share/HighFive/cmake") +set(HIGHFIVE_CMAKE_INSTALL_DIR "lib/cmake/HighFive" CACHE STRING + "Directory where HighFive's CMake code will be installed. Default: lib/cmake/HighFive") # Configure Tests & Examples From b4a094451d923f50ea380879f312acaa4b23fff3 Mon Sep 17 00:00:00 2001 From: Luc Grosheintz Date: Mon, 24 Mar 2025 11:41:56 +0100 Subject: [PATCH 6/6] trigger ci