1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
From: Markus Blatt <markus@dr-blatt.de>
Date: Sun, 17 Nov 2024 14:09:42 +0100
Subject: Use uppercase for components in FindSuitesparse
This is in line with DUNE since 2015 and fixes problems when trying to
use opm-grid as a DUNE module.
---
cmake/Modules/FindSuiteSparse.cmake | 31 +++++++++++++++++--------------
cmake/Modules/Finddune-istl.cmake | 2 +-
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/cmake/Modules/FindSuiteSparse.cmake b/cmake/Modules/FindSuiteSparse.cmake
index a70479d..c5973e3 100644
--- a/cmake/Modules/FindSuiteSparse.cmake
+++ b/cmake/Modules/FindSuiteSparse.cmake
@@ -4,12 +4,12 @@
# find_package (SuiteSparse COMPONENTS <list-of-components>)
#
# Components are:
-# amd Approximate Minimum Degree ordering
-# camd Constrained Approximate Minimum Degree ordering
-# colamd COLumn Approximate Minimum Degree ordering
-# ccolamd Constrained COLumn Approximate Minimum Degree ordering
-# cholmod Supernodal sparse Cholesky factorization and update
-# umfpack Unsymmetric MultiFrontal sparse LU factorization
+# AMD Approximate Minimum Degree ordering
+# CAMD Constrained Approximate Minimum Degree ordering
+# COLAMD COLumn Approximate Minimum Degree ordering
+# CCOLAMD Constrained COLumn Approximate Minimum Degree ordering
+# CHOLMOD Supernodal sparse Cholesky factorization and update
+# UMFPACK Unsymmetric MultiFrontal sparse LU factorization
#
# The following variables will be set:
#
@@ -117,12 +117,14 @@ endif (SuiteSparse_SEARCH_PATH)
# full list of modules that must be found to satisfy the user's link demands
set (SuiteSparse_MODULES ${SuiteSparse_FIND_COMPONENTS})
list (FIND SuiteSparse_MODULES "umfpack" UMFPACK_DESIRED)
+list (FIND SuiteSparse_MODULES "UMFPACK" UMFPACK_DESIRED)
if (NOT UMFPACK_DESIRED EQUAL -1)
- list (APPEND SuiteSparse_MODULES amd cholmod)
+ list (APPEND SuiteSparse_MODULES AMD CHOLMOD)
endif (NOT UMFPACK_DESIRED EQUAL -1)
list (FIND SuiteSparse_MODULES "cholmod" CHOLMOD_DESIRED)
+list (FIND SuiteSparse_MODULES "CHOLMOD" CHOLMOD_DESIRED)
if (NOT CHOLMOD_DESIRED EQUAL -1)
- list (APPEND SuiteSparse_MODULES amd camd colamd)
+ list (APPEND SuiteSparse_MODULES AMD CAMD COLAMD)
endif (NOT CHOLMOD_DESIRED EQUAL -1)
if (SuiteSparse_MODULES)
list (REMOVE_DUPLICATES SuiteSparse_MODULES)
@@ -179,16 +181,17 @@ endif (config_LIBRARY)
# search filesystem for each of the module individually
foreach (module IN LISTS SuiteSparse_MODULES)
string (TOUPPER ${module} MODULE)
+ string (TOLOWER ${module} _module_lower)
# search for files which implements this module
find_path (${MODULE}_INCLUDE_DIR
- NAMES ${module}.h
+ NAMES ${_module_lower}.h
PATHS ${SuiteSparse_SEARCH_PATH}
PATH_SUFFIXES "include" "include/suitesparse" "include/ufsparse" "${MODULE}/Include"
${_no_default_path}
)
find_library (${MODULE}_LIBRARY
- NAMES "${_pref_}${module}${_suff_}"
+ NAMES "${_pref_}${_module_lower}${_suff_}"
PATHS ${SuiteSparse_SEARCH_PATH}
PATH_SUFFIXES "lib/.libs" "lib" "lib${_BITS}" "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib/ufsparse" "${MODULE}/Lib"
${_no_default_path}
@@ -294,14 +297,14 @@ if(SuiteSparse_FOUND)
string (TOUPPER ${_module} _MODULE)
if(SuiteSparse_${_MODULE}_FOUND)
if(NOT TARGET SuiteSparse::${_module})
- message(STATUS "Creating target SuiteSparse::${_module}")
- add_library(SuiteSparse::${_module} UNKNOWN IMPORTED GLOBAL)
- set_target_properties(SuiteSparse::${_module} PROPERTIES
+ message(STATUS "Creating target SuiteSparse::${_MODULE}")
+ add_library(SuiteSparse::${_MODULE} UNKNOWN IMPORTED GLOBAL)
+ set_target_properties(SuiteSparse::${_MODULE} PROPERTIES
IMPORTED_LOCATION ${${_MODULE}_LIBRARY}
INCLUDE_DIRECTORIES ${${_MODULE}_INCLUDE_DIRS}
INTERFACE_LINK_LIBRARIES "${config_LIBRARY}")
target_link_libraries(SuiteSparse::SuiteSparse
- INTERFACE SuiteSparse::${_module})
+ INTERFACE SuiteSparse::${_MODULE})
endif()
endif()
endforeach(_module)
diff --git a/cmake/Modules/Finddune-istl.cmake b/cmake/Modules/Finddune-istl.cmake
index 6f548a4..5706bb3 100644
--- a/cmake/Modules/Finddune-istl.cmake
+++ b/cmake/Modules/Finddune-istl.cmake
@@ -19,7 +19,7 @@ find_opm_package (
"dune-common REQUIRED;
ParMETIS;
SuperLU;
- SuiteSparse COMPONENTS umfpack REQUIRED
+ SuiteSparse COMPONENTS UMFPACK REQUIRED
"
# header to search for
"dune/istl/bcrsmatrix.hh"
|
