Skip to content

Commit ec3ddba

Browse files
committed
Use only GAUXC_HAS_GAU2GRID variable
1 parent fa96f3e commit ec3ddba

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ set( GAUXC_HAS_CUDA FALSE CACHE BOOL "" FORCE )
5959
set( GAUXC_HAS_HIP FALSE CACHE BOOL "" FORCE )
6060
set( GAUXC_HAS_MPI FALSE CACHE BOOL "" FORCE )
6161
set( GAUXC_HAS_OPENMP FALSE CACHE BOOL "" FORCE )
62-
set( GAUXC_HAS_GAU2GRID FALSE CACHE BOOL "" FORCE )
63-
set( GAUXC_HAS_EXT_GG FALSE CACHE BOOL "" FORCE )
62+
set( GAUXC_HAS_GAU2GRID FALSE CACHE STRING "" FORCE )
6463
set( GAUXC_HAS_HDF5 FALSE CACHE BOOL "" FORCE )
6564
set( GAUXC_HAS_MAGMA FALSE CACHE BOOL "" FORCE )
6665
set( GAUXC_HAS_NCCL FALSE CACHE BOOL "" FORCE )
@@ -74,7 +73,6 @@ mark_as_advanced( FORCE
7473
GAUXC_HAS_MPI
7574
GAUXC_HAS_OPENMP
7675
GAUXC_HAS_GAU2GRID
77-
GAUXC_HAS_EXT_GG
7876
GAUXC_HAS_HDF5
7977
GAUXC_HAS_MAGMA
8078
GAUXC_HAS_NCCL

cmake/gauxc-config.cmake.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ set( GAUXC_HAS_CUTLASS @GAUXC_HAS_CUTLASS@ )
1919
set( GAUXC_HAS_MPI @GAUXC_HAS_MPI@ )
2020
set( GAUXC_HAS_OPENMP @GAUXC_HAS_OPENMP@ )
2121
set( GAUXC_HAS_GAU2GRID @GAUXC_HAS_GAU2GRID@ )
22-
set( GAUXC_HAS_EXT_GG @GAUXC_HAS_EXT_GG@ )
2322
set( GAUXC_HAS_HDF5 @GAUXC_HAS_HDF5@ )
2423
set( GAUXC_BLAS_IS_LP64 @GAUXC_BLAS_IS_LP64@ )
2524

@@ -31,7 +30,7 @@ if(GAUXC_HAS_OPENMP)
3130
find_dependency( OpenMP )
3231
endif()
3332

34-
if( GAUXC_HAS_EXT_GG AND NOT TARGET gau2grid::gg )
33+
if( GAUXC_HAS_GAU2GRID STREQUAL External )
3534
find_dependency( gau2grid )
3635
endif()
3736

cmake/gauxc-gau2grid.cmake

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,20 @@ if( GAUXC_ENABLE_GAU2GRID )
2929
message( STATUS "Something Went Horribly Wrong With Gau2Grid discovery!" )
3030
endif()
3131

32-
set( GAUXC_HAS_EXT_GG TRUE CACHE BOOL "GauXC is using an external Gau2Grid dependency" FORCE )
32+
set( GAUXC_HAS_GAU2GRID External CACHE STRING "GauXC has Gau2Grid and will build bindings" FORCE )
3333
else()
3434

3535
message( STATUS "Building Pregenerated Gau2grid" )
3636
add_subdirectory( ${PROJECT_SOURCE_DIR}/external/gau2grid ${PROJECT_BINARY_DIR}/external/gau2grid )
37+
set( GAUXC_HAS_GAU2GRID Vendored CACHE STRING "GauXC has Gau2Grid and will build bindings" FORCE )
3738

3839
endif()
3940

4041
else()
41-
set( GAUXC_HAS_EXT_GG TRUE CACHE BOOL "GauXC is using an external Gau2Grid dependency" FORCE )
42+
set( GAUXC_HAS_GAU2GRID External CACHE STRING "GauXC has Gau2Grid and will build bindings" FORCE )
4243
endif() # If not discoverable
44+
else()
45+
set( GAUXC_HAS_GAU2GRID External CACHE STRING "GauXC has Gau2Grid and will build bindings" FORCE )
4346
endif() # If target not present
4447

45-
set(GAUXC_HAS_GAU2GRID TRUE CACHE BOOL "GauXC has Gau2Grid and will build bindings" FORCE)
4648
endif() # If enabled

0 commit comments

Comments
 (0)