Merge branch 'develop' into feature/mri-adaptivity

LLNL · Oct 1, 2024 · adccf33 · adccf33
2 parents 96926e7 + 25ea7af
commit adccf33
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -56,6 +56,8 @@ Fixed loading the default IMEX-MRI method if `ARKodeSetOrder` is used to specify
 a third or fourth order method. Previously, the default second order method
 was loaded in both cases.
 
+Fixed a CMake configuration issue related to aliasing an `ALIAS` target when
+using `ENABLE_KLU=ON` in combination with a static-only build of SuiteSparse.
 
 ### Deprecation Notices
 

diff --git a/cmake/tpl/FindKLU.cmake b/cmake/tpl/FindKLU.cmake
@@ -40,7 +40,14 @@ if(NOT
 
   if(TARGET SuiteSparse::KLU)
     if(NOT TARGET SUNDIALS::KLU)
-      add_library(SUNDIALS::KLU ALIAS SuiteSparse::KLU)
+      # For static-only builds of SuiteSparse, SuiteSparse::KLU will itself be
+      # an ALIAS target which can't be aliased.
+      get_target_property(klu_aliased_target SuiteSparse::KLU ALIASED_TARGET)
+      if(klu_aliased_target)
+        add_library(SUNDIALS::KLU ALIAS ${klu_aliased_target})
+      else()
+        add_library(SUNDIALS::KLU ALIAS SuiteSparse::KLU)
+      endif()
       set(KLU_SUITESPARSE_TARGET ON)
       mark_as_advanced(KLU_SUITESPARSE_TARGET)
     endif()

diff --git a/doc/shared/RecentChanges.rst b/doc/shared/RecentChanges.rst
@@ -53,6 +53,8 @@ Fixed loading the default IMEX-MRI method if :c:func:`ARKodeSetOrder` is used to
 specify a third or fourth order method. Previously, the default second order method
 was loaded in both cases.
 
+Fixed a CMake configuration issue related to aliasing an ``ALIAS`` target when
+using ``ENABLE_KLU=ON`` in combination with a static-only build of SuiteSparse.
 
 **Deprecation Notices**