From 81be1ff4edc18cc82ab51ea6b5bbcd375ab03063 Mon Sep 17 00:00:00 2001 From: Sebastian Ehlert Date: Wed, 14 Jan 2026 09:32:53 +0100 Subject: [PATCH 1/3] Add gau2grid as dependency in GauXC config file --- cmake/gauxc-config.cmake.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/gauxc-config.cmake.in b/cmake/gauxc-config.cmake.in index 426b7f10..569b6957 100644 --- a/cmake/gauxc-config.cmake.in +++ b/cmake/gauxc-config.cmake.in @@ -30,6 +30,10 @@ if(GAUXC_HAS_OPENMP) find_dependency( OpenMP ) endif() +if(GAUXC_HAS_GAU2GRID AND NOT TARGET gau2grid::gg) + find_dependency( gau2grid ) +endif() + if( GAUXC_HAS_HOST ) if(GAUXC_BLAS_IS_LP64) set( _blas_components lp64 ) From bdebccf3a6361d44c109f90551298c6195c726fb Mon Sep 17 00:00:00 2001 From: Sebastian Ehlert Date: Wed, 14 Jan 2026 11:18:41 +0100 Subject: [PATCH 2/3] Only look for Gau2Grid if not vendored --- CMakeLists.txt | 2 ++ cmake/gauxc-config.cmake.in | 3 ++- cmake/gauxc-gau2grid.cmake | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94efc973..1342a63a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,6 +60,7 @@ set( GAUXC_HAS_HIP FALSE CACHE BOOL "" FORCE ) set( GAUXC_HAS_MPI FALSE CACHE BOOL "" FORCE ) set( GAUXC_HAS_OPENMP FALSE CACHE BOOL "" FORCE ) set( GAUXC_HAS_GAU2GRID FALSE CACHE BOOL "" FORCE ) +set( GAUXC_HAS_EXT_GG FALSE CACHE BOOL "" FORCE ) set( GAUXC_HAS_HDF5 FALSE CACHE BOOL "" FORCE ) set( GAUXC_HAS_MAGMA FALSE CACHE BOOL "" FORCE ) set( GAUXC_HAS_NCCL FALSE CACHE BOOL "" FORCE ) @@ -73,6 +74,7 @@ mark_as_advanced( FORCE GAUXC_HAS_MPI GAUXC_HAS_OPENMP GAUXC_HAS_GAU2GRID + GAUXC_HAS_EXT_GG GAUXC_HAS_HDF5 GAUXC_HAS_MAGMA GAUXC_HAS_NCCL diff --git a/cmake/gauxc-config.cmake.in b/cmake/gauxc-config.cmake.in index 569b6957..661157cf 100644 --- a/cmake/gauxc-config.cmake.in +++ b/cmake/gauxc-config.cmake.in @@ -19,6 +19,7 @@ set( GAUXC_HAS_CUTLASS @GAUXC_HAS_CUTLASS@ ) set( GAUXC_HAS_MPI @GAUXC_HAS_MPI@ ) set( GAUXC_HAS_OPENMP @GAUXC_HAS_OPENMP@ ) set( GAUXC_HAS_GAU2GRID @GAUXC_HAS_GAU2GRID@ ) +set( GAUXC_HAS_EXT_GG @GAUXC_HAS_EXT_GG@ ) set( GAUXC_HAS_HDF5 @GAUXC_HAS_HDF5@ ) set( GAUXC_BLAS_IS_LP64 @GAUXC_BLAS_IS_LP64@ ) @@ -30,7 +31,7 @@ if(GAUXC_HAS_OPENMP) find_dependency( OpenMP ) endif() -if(GAUXC_HAS_GAU2GRID AND NOT TARGET gau2grid::gg) +if(GAUXC_HAS_EXT_GG AND NOT TARGET gau2grid::gg) find_dependency( gau2grid ) endif() diff --git a/cmake/gauxc-gau2grid.cmake b/cmake/gauxc-gau2grid.cmake index 51db34d8..6ef6f649 100644 --- a/cmake/gauxc-gau2grid.cmake +++ b/cmake/gauxc-gau2grid.cmake @@ -28,7 +28,8 @@ if( GAUXC_ENABLE_GAU2GRID ) if( NOT TARGET gau2grid::gg ) message( STATUS "Something Went Horribly Wrong With Gau2Grid discovery!" ) endif() - + + set(GAUXC_HAS_EXT_GG TRUE CACHE BOOL "GauXC is using an external Gau2Grid dependency" FORCE) else() message( STATUS "Building Pregenerated Gau2grid" ) @@ -36,6 +37,8 @@ if( GAUXC_ENABLE_GAU2GRID ) endif() + else() + set(GAUXC_HAS_EXT_GG TRUE CACHE BOOL "GauXC is using an external Gau2Grid dependency" FORCE) endif() # If not discoverable endif() # If target not present From fa96f3ef2033f95ffce79a9b56b5beedf2579cb4 Mon Sep 17 00:00:00 2001 From: Sebastian Ehlert Date: Wed, 14 Jan 2026 12:53:30 +0100 Subject: [PATCH 3/3] Formatting --- cmake/gauxc-config.cmake.in | 2 +- cmake/gauxc-gau2grid.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/gauxc-config.cmake.in b/cmake/gauxc-config.cmake.in index 661157cf..c821589a 100644 --- a/cmake/gauxc-config.cmake.in +++ b/cmake/gauxc-config.cmake.in @@ -31,7 +31,7 @@ if(GAUXC_HAS_OPENMP) find_dependency( OpenMP ) endif() -if(GAUXC_HAS_EXT_GG AND NOT TARGET gau2grid::gg) +if( GAUXC_HAS_EXT_GG AND NOT TARGET gau2grid::gg ) find_dependency( gau2grid ) endif() diff --git a/cmake/gauxc-gau2grid.cmake b/cmake/gauxc-gau2grid.cmake index 6ef6f649..5dbe4ac1 100644 --- a/cmake/gauxc-gau2grid.cmake +++ b/cmake/gauxc-gau2grid.cmake @@ -29,7 +29,7 @@ if( GAUXC_ENABLE_GAU2GRID ) message( STATUS "Something Went Horribly Wrong With Gau2Grid discovery!" ) endif() - set(GAUXC_HAS_EXT_GG TRUE CACHE BOOL "GauXC is using an external Gau2Grid dependency" FORCE) + set( GAUXC_HAS_EXT_GG TRUE CACHE BOOL "GauXC is using an external Gau2Grid dependency" FORCE ) else() message( STATUS "Building Pregenerated Gau2grid" ) @@ -38,7 +38,7 @@ if( GAUXC_ENABLE_GAU2GRID ) endif() else() - set(GAUXC_HAS_EXT_GG TRUE CACHE BOOL "GauXC is using an external Gau2Grid dependency" FORCE) + set( GAUXC_HAS_EXT_GG TRUE CACHE BOOL "GauXC is using an external Gau2Grid dependency" FORCE ) endif() # If not discoverable endif() # If target not present