From a8a151d69460d2815c2530b6727e56874864f1fd Mon Sep 17 00:00:00 2001 From: Sebastian Ehlert Date: Tue, 11 Nov 2025 09:23:20 +0100 Subject: [PATCH 1/3] Allow finding HighFive dependency from environment --- cmake/gauxc-dep-versions.cmake | 2 +- src/external/CMakeLists.txt | 31 +++++++++++++++++-------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/cmake/gauxc-dep-versions.cmake b/cmake/gauxc-dep-versions.cmake index d27e7a0e..7946af25 100644 --- a/cmake/gauxc-dep-versions.cmake +++ b/cmake/gauxc-dep-versions.cmake @@ -19,5 +19,5 @@ set( GAUXC_GAU2GRID_REVISION v2.0.6 ) set( GAUXC_INTEGRATORXX_REPOSITORY https://github.com/wavefunction91/IntegratorXX.git ) set( GAUXC_INTEGRATORXX_REVISION 1369be58d7a3235dac36d75dd964fef058830622 ) -set( GAUXC_HIGHFIVE_REPOSITORY https://github.com/BlueBrain/HighFive.git ) +set( GAUXC_HIGHFIVE_REPOSITORY https://github.com/highfive-devs/HighFive.git ) set( GAUXC_HIGHFIVE_REVISION 805f0e13d09b47c4b01d40682621904aa3b31bb8 ) diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt index fa1f7f37..4bc11ccf 100644 --- a/src/external/CMakeLists.txt +++ b/src/external/CMakeLists.txt @@ -15,22 +15,25 @@ if( GAUXC_ENABLE_HDF5 ) if(HDF5_FOUND) set(GAUXC_HAS_HDF5 TRUE CACHE BOOL "" FORCE) message(STATUS "Enabling HDF5 Bindings") - message(STATUS "HighFive REPO = ${GAUXC_HIGHFIVE_REPOSITORY}") - message(STATUS "HighFive REV = ${GAUXC_HIGHFIVE_REVISION} ") - FetchContent_Declare( HighFive - GIT_REPOSITORY ${GAUXC_HIGHFIVE_REPOSITORY} - GIT_TAG ${GAUXC_HIGHFIVE_REVISION} - ) + find_package(HighFive QUITE) + if(NOT HighFive_FOUND) + message(STATUS "HighFive REPO = ${GAUXC_HIGHFIVE_REPOSITORY}") + message(STATUS "HighFive REV = ${GAUXC_HIGHFIVE_REVISION} ") + FetchContent_Declare( HighFive + GIT_REPOSITORY ${GAUXC_HIGHFIVE_REPOSITORY} + GIT_TAG ${GAUXC_HIGHFIVE_REVISION} + ) - set(HIGHFIVE_USE_BOOST OFF CACHE BOOL "" ) - set(HIGHFIVE_UNIT_TESTS OFF CACHE BOOL "" ) - set(HIGHFIVE_EXAMPLES OFF CACHE BOOL "" ) - #set(HIGHFIVE_PARALLEL_HDF5 ON CACHE BOOL "" ) - set(HIGHFIVE_BUILD_DOCS OFF CACHE BOOL "" ) - FetchContent_MakeAvailable( HighFive ) + set(HIGHFIVE_USE_BOOST OFF CACHE BOOL "" ) + set(HIGHFIVE_UNIT_TESTS OFF CACHE BOOL "" ) + set(HIGHFIVE_EXAMPLES OFF CACHE BOOL "" ) + #set(HIGHFIVE_PARALLEL_HDF5 ON CACHE BOOL "" ) + set(HIGHFIVE_BUILD_DOCS OFF CACHE BOOL "" ) + FetchContent_MakeAvailable( HighFive ) - target_sources( gauxc PRIVATE hdf5_write.cxx hdf5_read.cxx ) - target_link_libraries( gauxc PUBLIC HighFive ) + target_sources( gauxc PRIVATE hdf5_write.cxx hdf5_read.cxx ) + target_link_libraries( gauxc PUBLIC HighFive ) + endif() else() message(WARNING "GAUXC_ENABLE_HDF5 was enabled, but HDF5 was not found, Disabling HDF5 Bindings") endif() From 2535b84386f9e83cdc8c62ca98628878b7d71d77 Mon Sep 17 00:00:00 2001 From: Sebastian Ehlert <28669218+awvwgk@users.noreply.github.com> Date: Tue, 11 Nov 2025 11:32:27 +0100 Subject: [PATCH 2/3] Fix typo --- src/external/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt index 4bc11ccf..d6c3d4e1 100644 --- a/src/external/CMakeLists.txt +++ b/src/external/CMakeLists.txt @@ -15,7 +15,7 @@ if( GAUXC_ENABLE_HDF5 ) if(HDF5_FOUND) set(GAUXC_HAS_HDF5 TRUE CACHE BOOL "" FORCE) message(STATUS "Enabling HDF5 Bindings") - find_package(HighFive QUITE) + find_package(HighFive QUIET) if(NOT HighFive_FOUND) message(STATUS "HighFive REPO = ${GAUXC_HIGHFIVE_REPOSITORY}") message(STATUS "HighFive REV = ${GAUXC_HIGHFIVE_REVISION} ") From 2f31722c192e807ce2958bd249d97c35c21971b2 Mon Sep 17 00:00:00 2001 From: Sebastian Ehlert <28669218+awvwgk@users.noreply.github.com> Date: Tue, 11 Nov 2025 15:12:29 +0100 Subject: [PATCH 3/3] Link HighFive if found --- src/external/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt index d6c3d4e1..46612c81 100644 --- a/src/external/CMakeLists.txt +++ b/src/external/CMakeLists.txt @@ -31,9 +31,9 @@ if( GAUXC_ENABLE_HDF5 ) set(HIGHFIVE_BUILD_DOCS OFF CACHE BOOL "" ) FetchContent_MakeAvailable( HighFive ) - target_sources( gauxc PRIVATE hdf5_write.cxx hdf5_read.cxx ) - target_link_libraries( gauxc PUBLIC HighFive ) endif() + target_sources( gauxc PRIVATE hdf5_write.cxx hdf5_read.cxx ) + target_link_libraries( gauxc PUBLIC HighFive ) else() message(WARNING "GAUXC_ENABLE_HDF5 was enabled, but HDF5 was not found, Disabling HDF5 Bindings") endif()