merge w master

m-a-d-n-e-s-s · Oct 3, 2023 · a48732c · a48732c
2 parents 85125b2 + e4ee892
commit a48732c
Show file tree

Hide file tree

Showing 15 changed files with 308,557 additions and 32 deletions.
diff --git a/cmake/madness-config.cmake.in b/cmake/madness-config.cmake.in
@@ -226,3 +226,10 @@ if (@LIBXC_FOUND@)
   set(LIBXC_FOUND 1)
 endif()
 
+### LAPACK_LIBRARIES might include IMPORTED targets that are not globally available
+if (LAPACK_LIBRARIES MATCHES OpenMP::OpenMP_C AND NOT TARGET OpenMP::OpenMP_C)
+  find_package(OpenMP REQUIRED COMPONENTS C)
+endif()
+if (LAPACK_LIBRARIES MATCHES Threads::Threads AND NOT TARGET Threads::Threads)
+  find_package(Threads REQUIRED)
+endif()
diff --git a/external/lapack.cmake b/external/lapack.cmake
@@ -117,6 +117,14 @@ if (USER_LAPACK_LIBRARIES)
     endif(USER_LAPACK_LIBRARIES_IS_ACML)
   endif(USER_LAPACK_LIBRARIES_IS_MKL)
 
+  # LAPACK_LIBRARIES might include IMPORTED targets that are not globally available
+  if (LAPACK_LIBRARIES MATCHES OpenMP::OpenMP_C AND NOT TARGET OpenMP::OpenMP_C)
+    find_package(OpenMP REQUIRED COMPONENTS C)
+  endif()
+  if (LAPACK_LIBRARIES MATCHES Threads::Threads AND NOT TARGET Threads::Threads)
+    find_package(Threads REQUIRED)
+  endif()
+
 endif(USER_LAPACK_LIBRARIES)
 
 cmake_pop_check_state()

diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
@@ -5,7 +5,7 @@ set(EXAMPLE_SOURCES
     sdf_shape_tester test_gmres tdse1d vnucso nonlinschro sininteg functionio 
     dataloadbal hatom_1d binaryop dielectric hehf 3dharmonic testsolver
     testspectralprop dielectric_external_field tiny h2dynamic newsolver testcomplexfunctionsolver
-    helium_exact density_smoothing siam_example ac_corr
+    helium_exact density_smoothing siam_example ac_corr dirac-hatom
     derivatives array_worldobject)
 
 if(LIBXC_FOUND)