Merge branch 'master' into fortran-api

Author: awvwgk

include/gauxc/gauxc_config.hpp.in

@@ -12,10 +12,12 @@
 #pragma once
 
 #cmakedefine GAUXC_HAS_C
+#cmakedefine GAUXC_HAS_FORTRAN
 #cmakedefine GAUXC_HAS_HOST
 #cmakedefine GAUXC_HAS_CUDA
 #cmakedefine GAUXC_HAS_HIP
 #cmakedefine GAUXC_HAS_MPI
+#cmakedefine GAUXC_HAS_MPI_F08
 #cmakedefine GAUXC_HAS_MAGMA
 #cmakedefine GAUXC_HAS_NCCL
 #cmakedefine GAUXC_HAS_CUTLASS

src/CMakeLists.txt

@@ -97,7 +97,7 @@ target_link_libraries( gauxc PUBLIC
   ExchCXX::ExchCXX 
   IntegratorXX::IntegratorXX 
 )
-if( TARGET OpenMP::OpenMP_CXX )
+if( GAUXC_HAS_OPENMP AND TARGET OpenMP::OpenMP_CXX )
   target_link_libraries( gauxc PUBLIC OpenMP::OpenMP_CXX )
 else()
   find_package(Threads REQUIRED)
@@ -151,7 +151,10 @@ set_target_properties( gauxc PROPERTIES EXPORT_NAME gauxc )
 set(export_properties
   # currently configurable properties 
   "GAUXC_HAS_C"
+<<<<<<< HEAD
   "GAUXC_HAS_FORTRAN"
+=======
+>>>>>>> master
   "GAUXC_HAS_HOST"
   "GAUXC_HAS_DEVICE"
   "GAUXC_HAS_CUDA"
@@ -174,7 +177,10 @@ set(export_properties
 set_target_properties(gauxc
   PROPERTIES
     "GAUXC_HAS_C"          ${GAUXC_HAS_C}
+<<<<<<< HEAD
     "GAUXC_HAS_FORTRAN"    ${GAUXC_HAS_FORTRAN}
+=======
+>>>>>>> master
     "GAUXC_HAS_HOST"       ${GAUXC_HAS_HOST}
     "GAUXC_HAS_DEVICE"     ${GAUXC_HAS_DEVICE}
     "GAUXC_HAS_CUDA"       ${GAUXC_HAS_CUDA}
@@ -211,6 +217,10 @@ install(
   DESTINATION include/gauxc
 )
 
+<<<<<<< HEAD
+=======
+   
+>>>>>>> master
 # Export target to script
 set( INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/gauxc )
 install( EXPORT gauxc-targets

tests/CMakeLists.txt

@@ -17,6 +17,9 @@ message( STATUS "Building GauXC Tests" )
 add_library( gauxc_catch2 INTERFACE )
 
 find_package( Catch2 CONFIG QUIET )
+if( Catch2_FOUND AND Catch2_VERSION VERSION_GREATER_EQUAL 3 )
+  message(FATAL_ERROR "Catch2 v${Catch2_VERSION} found, but tests require Catch2 v2 (catch2/catch.hpp). Please install v2.")
+endif()
 if( NOT Catch2_FOUND )
 
   FetchContent_Declare(