]> git.pld-linux.org Git - packages/sundials.git/blame - sundials-cmake.patch
- updated to 2.7.0
[packages/sundials.git] / sundials-cmake.patch
CommitLineData
bc64d995
JB
1--- sundials-2.6.2/src/arkode/CMakeLists.txt.orig 2015-07-31 02:07:37.000000000 +0200
2+++ sundials-2.6.2/src/arkode/CMakeLists.txt 2023-01-19 17:32:41.649626680 +0100
3@@ -127,7 +127,7 @@ IF(BUILD_STATIC_LIBS)
4 PROPERTIES OUTPUT_NAME sundials_arkode CLEAN_DIRECT_OUTPUT 1)
5
6 # Install the ARKODE library
7- INSTALL(TARGETS sundials_arkode_static DESTINATION lib)
8+ INSTALL(TARGETS sundials_arkode_static DESTINATION lib${LIB_SUFFIX})
9
10 ENDIF(BUILD_STATIC_LIBS)
11
12@@ -138,6 +138,8 @@ IF(BUILD_SHARED_LIBS)
13 ADD_LIBRARY(sundials_arkode_shared SHARED
14 ${arkode_SOURCES} ${arkode_BL_SOURCES} ${shared_SOURCES})
15
838ad5e9 16+ TARGET_LINK_LIBRARIES(sundials_arkode_shared klu lapack m)
bc64d995
JB
17+
18 # Set the library name and make sure it is not deleted
19 SET_TARGET_PROPERTIES(sundials_arkode_shared
20 PROPERTIES OUTPUT_NAME sundials_arkode CLEAN_DIRECT_OUTPUT 1)
21@@ -147,7 +149,7 @@ IF(BUILD_SHARED_LIBS)
22 PROPERTIES VERSION ${arkodelib_VERSION} SOVERSION ${arkodelib_SOVERSION})
23
24 # Install the ARKODE library
25- INSTALL(TARGETS sundials_arkode_shared DESTINATION lib)
26+ INSTALL(TARGETS sundials_arkode_shared DESTINATION lib${LIB_SUFFIX})
27
28 ENDIF(BUILD_SHARED_LIBS)
29
30--- sundials-2.6.2/src/cvode/CMakeLists.txt.orig 2015-07-31 02:08:00.000000000 +0200
31+++ sundials-2.6.2/src/cvode/CMakeLists.txt 2023-01-19 17:34:07.565827899 +0100
32@@ -118,7 +118,7 @@ IF(BUILD_STATIC_LIBS)
33 PROPERTIES OUTPUT_NAME sundials_cvode CLEAN_DIRECT_OUTPUT 1)
34
35 # Install the CVODE library
36- INSTALL(TARGETS sundials_cvode_static DESTINATION lib)
37+ INSTALL(TARGETS sundials_cvode_static DESTINATION lib${LIB_SUFFIX})
38
39 ENDIF(BUILD_STATIC_LIBS)
40
41@@ -129,6 +129,8 @@ IF(BUILD_SHARED_LIBS)
42 ADD_LIBRARY(sundials_cvode_shared SHARED
43 ${cvode_SOURCES} ${cvode_BL_SOURCES} ${shared_SOURCES})
44
838ad5e9 45+ TARGET_LINK_LIBRARIES(sundials_cvode_shared klu lapack m)
bc64d995
JB
46+
47 # Set the library name and make sure it is not deleted
48 SET_TARGET_PROPERTIES(sundials_cvode_shared
49 PROPERTIES OUTPUT_NAME sundials_cvode CLEAN_DIRECT_OUTPUT 1)
50@@ -138,7 +140,7 @@ IF(BUILD_SHARED_LIBS)
51 PROPERTIES VERSION ${cvodelib_VERSION} SOVERSION ${cvodelib_SOVERSION})
52
53 # Install the CVODE library
54- INSTALL(TARGETS sundials_cvode_shared DESTINATION lib)
55+ INSTALL(TARGETS sundials_cvode_shared DESTINATION lib${LIB_SUFFIX})
56
57 ENDIF(BUILD_SHARED_LIBS)
58
59--- sundials-2.6.2/src/nvec_ser/CMakeLists.txt.orig 2015-07-31 02:07:26.000000000 +0200
60+++ sundials-2.6.2/src/nvec_ser/CMakeLists.txt 2023-01-20 06:13:11.683593284 +0100
61@@ -44,7 +44,7 @@ IF(BUILD_STATIC_LIBS)
62 ADD_LIBRARY(sundials_nvecserial_static STATIC ${nvecserial_SOURCES} ${shared_SOURCES})
63 SET_TARGET_PROPERTIES(sundials_nvecserial_static
64 PROPERTIES OUTPUT_NAME sundials_nvecserial CLEAN_DIRECT_OUTPUT 1)
65- INSTALL(TARGETS sundials_nvecserial_static DESTINATION lib)
66+ INSTALL(TARGETS sundials_nvecserial_static DESTINATION lib${LIB_SUFFIX})
67 ENDIF(BUILD_STATIC_LIBS)
68
69 # Rules for building and installing the shared library:
70@@ -54,11 +54,12 @@ ENDIF(BUILD_STATIC_LIBS)
71 # - Install the NVECSERIAL library
72 IF(BUILD_SHARED_LIBS)
73 ADD_LIBRARY(sundials_nvecserial_shared SHARED ${nvecserial_SOURCES} ${shared_SOURCES})
74+ TARGET_LINK_LIBRARIES(sundials_nvecserial_shared m)
75 SET_TARGET_PROPERTIES(sundials_nvecserial_shared
76 PROPERTIES OUTPUT_NAME sundials_nvecserial CLEAN_DIRECT_OUTPUT 1)
77 SET_TARGET_PROPERTIES(sundials_nvecserial_shared
78 PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
79- INSTALL(TARGETS sundials_nvecserial_shared DESTINATION lib)
80+ INSTALL(TARGETS sundials_nvecserial_shared DESTINATION lib${LIB_SUFFIX})
81 ENDIF(BUILD_SHARED_LIBS)
82
83 # Install the NVECSERIAL header files
84@@ -71,15 +72,16 @@ IF(FCMIX_ENABLE AND F77_FOUND)
85 ADD_LIBRARY(sundials_fnvecserial_static STATIC ${fnvecserial_SOURCES})
86 SET_TARGET_PROPERTIES(sundials_fnvecserial_static
87 PROPERTIES OUTPUT_NAME sundials_fnvecserial CLEAN_DIRECT_OUTPUT 1)
88- INSTALL(TARGETS sundials_fnvecserial_static DESTINATION lib)
89+ INSTALL(TARGETS sundials_fnvecserial_static DESTINATION lib${LIB_SUFFIX})
90 ENDIF(BUILD_STATIC_LIBS)
91 IF(BUILD_SHARED_LIBS)
92 ADD_LIBRARY(sundials_fnvecserial_shared ${fnvecserial_SOURCES})
93+ TARGET_LINK_LIBRARIES(sundials_fnvecserial_shared sundials_nvecserial_shared)
94 SET_TARGET_PROPERTIES(sundials_fnvecserial_shared
95 PROPERTIES OUTPUT_NAME sundials_fnvecserial CLEAN_DIRECT_OUTPUT 1)
96 SET_TARGET_PROPERTIES(sundials_fnvecserial_shared
97 PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
98- INSTALL(TARGETS sundials_fnvecserial_shared DESTINATION lib)
99+ INSTALL(TARGETS sundials_fnvecserial_shared DESTINATION lib${LIB_SUFFIX})
100 ENDIF(BUILD_SHARED_LIBS)
101 ENDIF(FCMIX_ENABLE AND F77_FOUND)
102
103--- sundials-2.6.2/src/nvec_openmp/CMakeLists.txt.orig 2015-07-31 02:07:26.000000000 +0200
104+++ sundials-2.6.2/src/nvec_openmp/CMakeLists.txt 2023-01-20 06:13:23.611528600 +0100
105@@ -51,7 +51,7 @@ IF(BUILD_STATIC_LIBS)
106 ADD_LIBRARY(sundials_nvecopenmp_static STATIC ${nvecopenmp_SOURCES} ${shared_SOURCES})
107 SET_TARGET_PROPERTIES(sundials_nvecopenmp_static
108 PROPERTIES OUTPUT_NAME sundials_nvecopenmp CLEAN_DIRECT_OUTPUT 1)
109- INSTALL(TARGETS sundials_nvecopenmp_static DESTINATION lib)
110+ INSTALL(TARGETS sundials_nvecopenmp_static DESTINATION lib${LIB_SUFFIX})
111 ENDIF(BUILD_STATIC_LIBS)
112
113 # Rules for building and installing the shared library:
114@@ -61,11 +61,12 @@ ENDIF(BUILD_STATIC_LIBS)
115 # - Install the NVECOPENMP library
116 IF(BUILD_SHARED_LIBS)
117 ADD_LIBRARY(sundials_nvecopenmp_shared SHARED ${nvecopenmp_SOURCES} ${shared_SOURCES})
118+ TARGET_LINK_LIBRARIES(sundials_nvecopenmp_shared m)
119 SET_TARGET_PROPERTIES(sundials_nvecopenmp_shared
120 PROPERTIES OUTPUT_NAME sundials_nvecopenmp CLEAN_DIRECT_OUTPUT 1)
121 SET_TARGET_PROPERTIES(sundials_nvecopenmp_shared
122 PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
123- INSTALL(TARGETS sundials_nvecopenmp_shared DESTINATION lib)
124+ INSTALL(TARGETS sundials_nvecopenmp_shared DESTINATION lib${LIB_SUFFIX})
125 ENDIF(BUILD_SHARED_LIBS)
126
127 # Install the NVECOPENMP header files
128@@ -78,15 +79,16 @@ IF(FCMIX_ENABLE AND F77_FOUND)
129 ADD_LIBRARY(sundials_fnvecopenmp_static STATIC ${fnvecopenmp_SOURCES})
130 SET_TARGET_PROPERTIES(sundials_fnvecopenmp_static
131 PROPERTIES OUTPUT_NAME sundials_fnvecopenmp CLEAN_DIRECT_OUTPUT 1)
132- INSTALL(TARGETS sundials_fnvecopenmp_static DESTINATION lib)
133+ INSTALL(TARGETS sundials_fnvecopenmp_static DESTINATION lib${LIB_SUFFIX})
134 ENDIF(BUILD_STATIC_LIBS)
135 IF(BUILD_SHARED_LIBS)
136 ADD_LIBRARY(sundials_fnvecopenmp_shared ${fnvecopenmp_SOURCES})
137+ TARGET_LINK_LIBRARIES(sundials_fnvecopenmp_shared sundials_nvecopenmp_shared)
138 SET_TARGET_PROPERTIES(sundials_fnvecopenmp_shared
139 PROPERTIES OUTPUT_NAME sundials_fnvecopenmp CLEAN_DIRECT_OUTPUT 1)
140 SET_TARGET_PROPERTIES(sundials_fnvecopenmp_shared
141 PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
142- INSTALL(TARGETS sundials_fnvecopenmp_shared DESTINATION lib)
143+ INSTALL(TARGETS sundials_fnvecopenmp_shared DESTINATION lib${LIB_SUFFIX})
144 ENDIF(BUILD_SHARED_LIBS)
145 ENDIF(FCMIX_ENABLE AND F77_FOUND)
146
147--- sundials-2.6.2/src/nvec_pthreads/CMakeLists.txt.orig 2015-07-31 02:07:26.000000000 +0200
148+++ sundials-2.6.2/src/nvec_pthreads/CMakeLists.txt 2023-01-20 06:13:36.412659311 +0100
149@@ -44,7 +44,7 @@ IF(BUILD_STATIC_LIBS)
150 ADD_LIBRARY(sundials_nvecpthreads_static STATIC ${nvecpthreads_SOURCES} ${shared_SOURCES})
151 SET_TARGET_PROPERTIES(sundials_nvecpthreads_static
152 PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
153- INSTALL(TARGETS sundials_nvecpthreads_static DESTINATION lib)
154+ INSTALL(TARGETS sundials_nvecpthreads_static DESTINATION lib${LIB_SUFFIX})
155 ENDIF(BUILD_STATIC_LIBS)
156
157 # Rules for building and installing the shared library:
158@@ -54,11 +54,12 @@ ENDIF(BUILD_STATIC_LIBS)
159 # - Install the NVECPTHREADS library
160 IF(BUILD_SHARED_LIBS)
161 ADD_LIBRARY(sundials_nvecpthreads_shared SHARED ${nvecpthreads_SOURCES} ${shared_SOURCES})
162+ TARGET_LINK_LIBRARIES(sundials_nvecpthreads_shared m)
163 SET_TARGET_PROPERTIES(sundials_nvecpthreads_shared
164 PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
165 SET_TARGET_PROPERTIES(sundials_nvecpthreads_shared
166 PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
167- INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION lib)
168+ INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION lib${LIB_SUFFIX})
169 ENDIF(BUILD_SHARED_LIBS)
170
171 # Install the NVECPTHREADS header files
172@@ -71,15 +72,16 @@ IF(FCMIX_ENABLE AND F77_FOUND)
173 ADD_LIBRARY(sundials_fnvecpthreads_static STATIC ${fnvecpthreads_SOURCES})
174 SET_TARGET_PROPERTIES(sundials_fnvecpthreads_static
175 PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
176- INSTALL(TARGETS sundials_fnvecpthreads_static DESTINATION lib)
177+ INSTALL(TARGETS sundials_fnvecpthreads_static DESTINATION lib${LIB_SUFFIX})
178 ENDIF(BUILD_STATIC_LIBS)
179 IF(BUILD_SHARED_LIBS)
180 ADD_LIBRARY(sundials_fnvecpthreads_shared ${fnvecpthreads_SOURCES})
181+ TARGET_LINK_LIBRARIES(sundials_fnvecpthreads_shared sundials_nvecpthreads_shared)
182 SET_TARGET_PROPERTIES(sundials_fnvecpthreads_shared
183 PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
184 SET_TARGET_PROPERTIES(sundials_fnvecpthreads_shared
185 PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
186- INSTALL(TARGETS sundials_fnvecpthreads_shared DESTINATION lib)
187+ INSTALL(TARGETS sundials_fnvecpthreads_shared DESTINATION lib${LIB_SUFFIX})
188 ENDIF(BUILD_SHARED_LIBS)
189 ENDIF(FCMIX_ENABLE AND F77_FOUND)
190
191--- sundials-2.6.2/src/cvodes/CMakeLists.txt.orig 2015-07-31 02:08:15.000000000 +0200
192+++ sundials-2.6.2/src/cvodes/CMakeLists.txt 2023-01-20 06:14:20.281121648 +0100
193@@ -121,7 +121,7 @@ IF(BUILD_STATIC_LIBS)
194 PROPERTIES OUTPUT_NAME sundials_cvodes CLEAN_DIRECT_OUTPUT 1)
195
196 # Install the CVODES library
197- INSTALL(TARGETS sundials_cvodes_static DESTINATION lib)
198+ INSTALL(TARGETS sundials_cvodes_static DESTINATION lib${LIB_SUFFIX})
199
200 ENDIF(BUILD_STATIC_LIBS)
201
202@@ -132,6 +132,8 @@ IF(BUILD_SHARED_LIBS)
203 ADD_LIBRARY(sundials_cvodes_shared SHARED
204 ${cvodes_SOURCES} ${cvodes_BL_SOURCES} ${shared_SOURCES})
205
838ad5e9 206+ TARGET_LINK_LIBRARIES(sundials_cvodes_shared klu lapack m)
bc64d995
JB
207+
208 # Set the library name and make sure it is not deleted
209 SET_TARGET_PROPERTIES(sundials_cvodes_shared
210 PROPERTIES OUTPUT_NAME sundials_cvodes CLEAN_DIRECT_OUTPUT 1)
211@@ -141,7 +143,7 @@ IF(BUILD_SHARED_LIBS)
212 PROPERTIES VERSION ${cvodeslib_VERSION} SOVERSION ${cvodeslib_SOVERSION})
213
214 # Install the CVODES library
215- INSTALL(TARGETS sundials_cvodes_shared DESTINATION lib)
216+ INSTALL(TARGETS sundials_cvodes_shared DESTINATION lib${LIB_SUFFIX})
217
218 ENDIF(BUILD_SHARED_LIBS)
219
220--- sundials-2.6.2/src/ida/CMakeLists.txt.orig 2015-07-31 02:08:39.000000000 +0200
221+++ sundials-2.6.2/src/ida/CMakeLists.txt 2023-01-20 06:15:08.862858469 +0100
222@@ -114,7 +114,7 @@ IF(BUILD_STATIC_LIBS)
223 PROPERTIES OUTPUT_NAME sundials_ida CLEAN_DIRECT_OUTPUT 1)
224
225 # Install the IDA library
226- INSTALL(TARGETS sundials_ida_static DESTINATION lib)
227+ INSTALL(TARGETS sundials_ida_static DESTINATION lib${LIB_SUFFIX})
228
229 ENDIF(BUILD_STATIC_LIBS)
230
231@@ -125,6 +125,8 @@ IF(BUILD_SHARED_LIBS)
232 ADD_LIBRARY(sundials_ida_shared SHARED
233 ${ida_SOURCES} ${ida_BL_SOURCES} ${shared_SOURCES})
234
838ad5e9 235+ TARGET_LINK_LIBRARIES(sundials_ida_shared klu lapack m)
bc64d995
JB
236+
237 # Set the library name and make sure it is not deleted
238 SET_TARGET_PROPERTIES(sundials_ida_shared
239 PROPERTIES OUTPUT_NAME sundials_ida CLEAN_DIRECT_OUTPUT 1)
240@@ -134,7 +136,7 @@ IF(BUILD_SHARED_LIBS)
241 PROPERTIES VERSION ${idalib_VERSION} SOVERSION ${idalib_SOVERSION})
242
243 # Install the IDA library
244- INSTALL(TARGETS sundials_ida_shared DESTINATION lib)
245+ INSTALL(TARGETS sundials_ida_shared DESTINATION lib${LIB_SUFFIX})
246
247 ENDIF(BUILD_SHARED_LIBS)
248
249--- sundials-2.6.2/src/idas/CMakeLists.txt.orig 2015-07-31 02:08:55.000000000 +0200
250+++ sundials-2.6.2/src/idas/CMakeLists.txt 2023-01-20 06:15:52.131274057 +0100
251@@ -126,7 +126,7 @@ IF(BUILD_STATIC_LIBS)
252 PROPERTIES OUTPUT_NAME sundials_idas CLEAN_DIRECT_OUTPUT 1)
253
254 # Install the IDA library
255- INSTALL(TARGETS sundials_idas_static DESTINATION lib)
256+ INSTALL(TARGETS sundials_idas_static DESTINATION lib${LIB_SUFFIX})
257
258 ENDIF(BUILD_STATIC_LIBS)
259
260@@ -137,6 +137,8 @@ IF(BUILD_SHARED_LIBS)
261 ADD_LIBRARY(sundials_idas_shared SHARED
262 ${idas_SOURCES} ${idas_BL_SOURCES} ${idas_SLU_SOURCES} ${shared_SOURCES})
263
838ad5e9 264+ TARGET_LINK_LIBRARIES(sundials_idas_shared klu lapack m)
bc64d995
JB
265+
266 # Set the library name and make sure it is not deleted
267 SET_TARGET_PROPERTIES(sundials_idas_shared
268 PROPERTIES OUTPUT_NAME sundials_idas CLEAN_DIRECT_OUTPUT 1)
269@@ -146,7 +148,7 @@ IF(BUILD_SHARED_LIBS)
270 PROPERTIES VERSION ${idaslib_VERSION} SOVERSION ${idaslib_SOVERSION})
271
272 # Install the IDAS library
273- INSTALL(TARGETS sundials_idas_shared DESTINATION lib)
274+ INSTALL(TARGETS sundials_idas_shared DESTINATION lib${LIB_SUFFIX})
275
276 ENDIF(BUILD_SHARED_LIBS)
277
838ad5e9
JB
278--- sundials-2.7.0/src/kinsol/CMakeLists.txt.orig 2016-09-27 19:27:29.000000000 +0200
279+++ sundials-2.7.0/src/kinsol/CMakeLists.txt 2023-01-21 07:57:43.080383525 +0100
280@@ -134,7 +134,7 @@ IF(BUILD_STATIC_LIBS)
bc64d995
JB
281 PROPERTIES OUTPUT_NAME sundials_kinsol CLEAN_DIRECT_OUTPUT 1)
282
283 # Install the KINSOL library
284- INSTALL(TARGETS sundials_kinsol_static DESTINATION lib)
285+ INSTALL(TARGETS sundials_kinsol_static DESTINATION lib${LIB_SUFFIX})
286
287 ENDIF(BUILD_STATIC_LIBS)
288
838ad5e9 289@@ -145,6 +145,8 @@ IF(BUILD_SHARED_LIBS)
bc64d995 290 ADD_LIBRARY(sundials_kinsol_shared SHARED
838ad5e9 291 ${kinsol_SOURCES} ${kinsol_BL_SOURCES} ${kinsol_SLU_SOURCES} ${kinsol_KLU_SOURCES} ${shared_SOURCES})
bc64d995 292
838ad5e9 293+ TARGET_LINK_LIBRARIES(sundials_kinsol_shared klu lapack m)
bc64d995
JB
294+
295 # Set the library name and make sure it is not deleted
296 SET_TARGET_PROPERTIES(sundials_kinsol_shared
297 PROPERTIES OUTPUT_NAME sundials_kinsol CLEAN_DIRECT_OUTPUT 1)
838ad5e9 298@@ -154,7 +156,7 @@ IF(BUILD_SHARED_LIBS)
bc64d995
JB
299 PROPERTIES VERSION ${kinsollib_VERSION} SOVERSION ${kinsollib_SOVERSION})
300
301 # Install the KINSOL library
302- INSTALL(TARGETS sundials_kinsol_shared DESTINATION lib)
303+ INSTALL(TARGETS sundials_kinsol_shared DESTINATION lib${LIB_SUFFIX})
304
305 ENDIF(BUILD_SHARED_LIBS)
306
This page took 0.228816 seconds and 4 git commands to generate.