Merge pull request #664 from mmuetzel/cmake

KLU: Check for dependencies before including target file
DrTimothyAldenDavis · Dec 30, 2023 · 7e6a8dd · 7e6a8dd
2 parents 1c95f6e + bd14c4d
commit 7e6a8dd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/KLU/Config/KLUConfig.cmake.in b/KLU/Config/KLUConfig.cmake.in
@@ -35,8 +35,6 @@ set ( KLU_VERSION_MINOR @KLU_VERSION_MINOR@ )
 set ( KLU_VERSION_PATCH @KLU_VERSION_SUB@ )
 set ( KLU_VERSION "@KLU_VERSION_MAJOR@.@KLU_VERSION_MINOR@.@KLU_VERSION_SUB@" )
 
-include ( ${CMAKE_CURRENT_LIST_DIR}/KLUTargets.cmake )
-
 # Check for dependent targets
 include ( CMakeFindDependencyMacro )
 
@@ -103,6 +101,9 @@ if ( NOT SuiteSparse_config_FOUND OR NOT BTF_FOUND OR NOT AMD_FOUND OR NOT COLAM
 endif ( )
 
 
+# Import target
+include ( ${CMAKE_CURRENT_LIST_DIR}/KLUTargets.cmake )
+
 # The following is only for backward compatibility with FindKLU.
 
 set ( _target_shared SuiteSparse::KLU )

diff --git a/SuiteSparse_config/Config/SuiteSparse_configConfig.cmake.in b/SuiteSparse_config/Config/SuiteSparse_configConfig.cmake.in
@@ -53,6 +53,7 @@ if ( NOT _dependencies_found )
 endif ( )
 
 
+# Import target
 include ( ${CMAKE_CURRENT_LIST_DIR}/SuiteSparse_configTargets.cmake )
 
 if ( @SUITESPARSE_HAS_OPENMP@ )
@@ -80,6 +81,7 @@ if ( @SUITESPARSE_HAS_OPENMP@ )
     endif ( )
 endif ( )
 
+
 # The following is only for backward compatibility with FindSuiteSparse_config.
 
 set ( _target_shared SuiteSparse::SuiteSparseConfig )

diff --git a/UMFPACK/Config/UMFPACKConfig.cmake.in b/UMFPACK/Config/UMFPACKConfig.cmake.in
@@ -92,6 +92,8 @@ if ( NOT SuiteSparse_config_FOUND OR NOT AMD_FOUND
     return ( )
 endif ( )
 
+
+# Import target
 include ( ${CMAKE_CURRENT_LIST_DIR}/UMFPACKTargets.cmake )
 
 # The following is only for backward compatibility with FindUMFPACK.