1 |
commit: 7185e731bd07735474852ee3669ddc764ef6e7e2 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 2 12:42:39 2018 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 2 12:45:22 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7185e731 |
7 |
|
8 |
sci-libs/trilinos: Drop old |
9 |
|
10 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.27, Repoman-2.3.9 |
12 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
13 |
|
14 |
...nos-11.14.1-fix_install_paths_for_destdir.patch | 617 --------------------- |
15 |
.../files/trilinos-12.10.1-fix_gcc_7.patch | 57 -- |
16 |
...s-12.10.1-fix_install_paths_for_destdir-2.patch | 10 - |
17 |
...nos-12.10.1-fix_install_paths_for_destdir.patch | 603 -------------------- |
18 |
sci-libs/trilinos/trilinos-11.14.1-r1.ebuild | 207 ------- |
19 |
sci-libs/trilinos/trilinos-12.10.1-r1.ebuild | 220 -------- |
20 |
6 files changed, 1714 deletions(-) |
21 |
|
22 |
diff --git a/sci-libs/trilinos/files/trilinos-11.14.1-fix_install_paths_for_destdir.patch b/sci-libs/trilinos/files/trilinos-11.14.1-fix_install_paths_for_destdir.patch |
23 |
deleted file mode 100644 |
24 |
index e24fc495b..000000000 |
25 |
--- a/sci-libs/trilinos/files/trilinos-11.14.1-fix_install_paths_for_destdir.patch |
26 |
+++ /dev/null |
27 |
@@ -1,617 +0,0 @@ |
28 |
-diff --git a/commonTools/gtest/CMakeLists.txt b/commonTools/gtest/CMakeLists.txt |
29 |
-index 9367010..17f8892 100644 |
30 |
---- a/commonTools/gtest/CMakeLists.txt |
31 |
-+++ b/commonTools/gtest/CMakeLists.txt |
32 |
-@@ -31,7 +31,7 @@ TRIBITS_ADD_LIBRARY( |
33 |
- ) |
34 |
- |
35 |
- #install gtest header into the correct subdir. |
36 |
--INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/gtest/) |
37 |
-+INSTALL(FILES ${HEADERS} DESTINATION ${Trilinos_INSTALL_INCLUDE_DIR}/gtest/) |
38 |
- |
39 |
- |
40 |
- |
41 |
-diff --git a/packages/kokkos/TPL/CMakeLists.txt b/packages/kokkos/TPL/CMakeLists.txt |
42 |
-index 8119c31..2d74336 100644 |
43 |
---- a/packages/kokkos/TPL/CMakeLists.txt |
44 |
-+++ b/packages/kokkos/TPL/CMakeLists.txt |
45 |
-@@ -1,7 +1,7 @@ |
46 |
- |
47 |
- TRIBITS_SUBPACKAGE(TPL) |
48 |
- |
49 |
--SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
50 |
-+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
51 |
- |
52 |
- IF( Kokkos_ENABLE_Cuda ) |
53 |
- |
54 |
-diff --git a/packages/kokkos/containers/src/CMakeLists.txt b/packages/kokkos/containers/src/CMakeLists.txt |
55 |
-index da5a791..65a7c76 100644 |
56 |
---- a/packages/kokkos/containers/src/CMakeLists.txt |
57 |
-+++ b/packages/kokkos/containers/src/CMakeLists.txt |
58 |
-@@ -15,7 +15,7 @@ FILE(GLOB HEADERS *.hpp) |
59 |
- FILE(GLOB HEADERS_IMPL impl/*.hpp) |
60 |
- FILE(GLOB SOURCES impl/*.cpp) |
61 |
- |
62 |
--SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
63 |
-+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
64 |
- |
65 |
- INSTALL(FILES ${HEADERS_IMPL} DESTINATION ${TRILINOS_INCDIR}/impl/) |
66 |
- |
67 |
-diff --git a/packages/kokkos/core/src/CMakeLists.txt b/packages/kokkos/core/src/CMakeLists.txt |
68 |
-index 7e0e150..d1ed33a 100644 |
69 |
---- a/packages/kokkos/core/src/CMakeLists.txt |
70 |
-+++ b/packages/kokkos/core/src/CMakeLists.txt |
71 |
-@@ -13,7 +13,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) |
72 |
- |
73 |
- #----------------------------------------------------------------------------- |
74 |
- |
75 |
--SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
76 |
-+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
77 |
- |
78 |
- #----------------------------------------------------------------------------- |
79 |
- |
80 |
-diff --git a/packages/kokkos/core/src/impl/CMakeLists.txt b/packages/kokkos/core/src/impl/CMakeLists.txt |
81 |
-index c543194..1021f42 100644 |
82 |
---- a/packages/kokkos/core/src/impl/CMakeLists.txt |
83 |
-+++ b/packages/kokkos/core/src/impl/CMakeLists.txt |
84 |
-@@ -12,7 +12,7 @@ TRIBITS_ADD_LIBRARY( |
85 |
- DEPLIBS |
86 |
- ) |
87 |
- |
88 |
--SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
89 |
-+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
90 |
- |
91 |
- INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/impl/) |
92 |
- |
93 |
-diff --git a/packages/seacas/libraries/ioss/src/init/CMakeLists.txt b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt |
94 |
-index 573c972..8056913 100644 |
95 |
---- a/packages/seacas/libraries/ioss/src/init/CMakeLists.txt |
96 |
-+++ b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt |
97 |
-@@ -50,5 +50,5 @@ IF (BUILD_TESTING) |
98 |
- ENDIF (BUILD_TESTING) |
99 |
- |
100 |
- INSTALL(FILES ${HEADERS} DESTINATION |
101 |
-- ${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/init/) |
102 |
-+ ${Trilinos_INSTALL_INCLUDE_DIR}/init/) |
103 |
- |
104 |
-diff --git a/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt b/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt |
105 |
-index 695b21d..8f2045c 100644 |
106 |
---- a/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt |
107 |
-+++ b/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt |
108 |
-@@ -46,7 +46,7 @@ TRIBITS_ADD_LIBRARY( |
109 |
- ) |
110 |
- |
111 |
- INSTALL(FILES ${HEADERS} DESTINATION |
112 |
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/) |
113 |
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/) |
114 |
- |
115 |
- ADD_SUBDIRECTORY(main) |
116 |
- |
117 |
-diff --git a/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt b/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt |
118 |
-index db930be..c3cd3b4 100644 |
119 |
---- a/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt |
120 |
-+++ b/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt |
121 |
-@@ -34,5 +34,5 @@ ENDIF() |
122 |
- |
123 |
- |
124 |
- INSTALL(FILES ${HEADERS} DESTINATION |
125 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/) |
126 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/) |
127 |
- |
128 |
-diff --git a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt |
129 |
-index ec7f650..a98b073 100644 |
130 |
---- a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt |
131 |
-+++ b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt |
132 |
-@@ -22,5 +22,5 @@ TRIBITS_ADD_LIBRARY( |
133 |
- ) |
134 |
- |
135 |
- INSTALL(FILES ${HEADERS} DESTINATION |
136 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/) |
137 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/) |
138 |
- |
139 |
-diff --git a/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt b/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt |
140 |
-index e738def..e8ad166 100644 |
141 |
---- a/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt |
142 |
-+++ b/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt |
143 |
-@@ -47,4 +47,4 @@ TRIBITS_ADD_LIBRARY( |
144 |
- ) |
145 |
- |
146 |
- INSTALL(FILES ${HEADERS} DESTINATION |
147 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval) |
148 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval) |
149 |
-diff --git a/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt b/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt |
150 |
-index 38d9b5c..7b1d105 100644 |
151 |
---- a/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt |
152 |
-+++ b/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt |
153 |
-@@ -50,7 +50,7 @@ TRIBITS_ADD_LIBRARY( |
154 |
- ) |
155 |
- |
156 |
- INSTALL(FILES ${HEADERS} DESTINATION |
157 |
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/) |
158 |
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/) |
159 |
- |
160 |
- # AGS: I moved this to the bottom so that the link order was correct |
161 |
- # with -lstk_io_uti before -lstk_io. I think the DEPLIBS added in |
162 |
-diff --git a/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt b/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt |
163 |
-index 0412574..b15f54a 100644 |
164 |
---- a/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt |
165 |
-+++ b/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt |
166 |
-@@ -46,4 +46,4 @@ TRIBITS_ADD_LIBRARY( |
167 |
- ) |
168 |
- |
169 |
- INSTALL(FILES ${HEADERS} DESTINATION |
170 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/) |
171 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/) |
172 |
-diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt |
173 |
-index 71c6697..770eb52 100644 |
174 |
---- a/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt |
175 |
-+++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt |
176 |
-@@ -55,7 +55,7 @@ TRIBITS_ADD_LIBRARY( |
177 |
- ) |
178 |
- |
179 |
- INSTALL(FILES ${HEADERS} DESTINATION |
180 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/) |
181 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/) |
182 |
- |
183 |
- INSTALL(FILES ${HEADERS_IMPL} DESTINATION |
184 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/) |
185 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/) |
186 |
-diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt |
187 |
-index 844088a..398640d 100644 |
188 |
---- a/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt |
189 |
-+++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt |
190 |
-@@ -49,5 +49,5 @@ TRIBITS_ADD_LIBRARY( |
191 |
- ) |
192 |
- |
193 |
- INSTALL(FILES ${HEADERS} DESTINATION |
194 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/) |
195 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/) |
196 |
- |
197 |
-diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt |
198 |
-index 7162134..4738933 100644 |
199 |
---- a/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt |
200 |
-+++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt |
201 |
-@@ -55,4 +55,4 @@ TRIBITS_ADD_LIBRARY( |
202 |
- ) |
203 |
- |
204 |
- INSTALL(FILES ${HEADERS} DESTINATION |
205 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) |
206 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) |
207 |
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt |
208 |
-index 854268d..68b3533 100644 |
209 |
---- a/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt |
210 |
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt |
211 |
-@@ -68,5 +68,5 @@ TRIBITS_ADD_LIBRARY( |
212 |
- ) |
213 |
- |
214 |
- INSTALL(FILES ${HEADERS} DESTINATION |
215 |
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/) |
216 |
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/) |
217 |
- |
218 |
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt |
219 |
-index 10868c3..fa854bc 100644 |
220 |
---- a/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt |
221 |
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt |
222 |
-@@ -35,5 +35,5 @@ ENDIF() |
223 |
- |
224 |
- |
225 |
- INSTALL(FILES ${HEADERS} DESTINATION |
226 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/) |
227 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/) |
228 |
- |
229 |
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt |
230 |
-index a60a1a8..6f2d965 100644 |
231 |
---- a/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt |
232 |
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt |
233 |
-@@ -37,5 +37,5 @@ ENDIF() |
234 |
- |
235 |
- |
236 |
- INSTALL(FILES ${HEADERS} DESTINATION |
237 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/) |
238 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/) |
239 |
- |
240 |
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt |
241 |
-index ebea648..e6f5344 100644 |
242 |
---- a/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt |
243 |
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt |
244 |
-@@ -36,5 +36,5 @@ ENDIF() |
245 |
- |
246 |
- |
247 |
- INSTALL(FILES ${HEADERS} DESTINATION |
248 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/) |
249 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/) |
250 |
- |
251 |
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt |
252 |
-index 2b256f1..b27238f 100644 |
253 |
---- a/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt |
254 |
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt |
255 |
-@@ -35,5 +35,5 @@ ENDIF() |
256 |
- |
257 |
- |
258 |
- INSTALL(FILES ${HEADERS} DESTINATION |
259 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/) |
260 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/) |
261 |
- |
262 |
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt |
263 |
-index 2acb307..411ab23 100644 |
264 |
---- a/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt |
265 |
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt |
266 |
-@@ -35,5 +35,5 @@ ENDIF() |
267 |
- |
268 |
- |
269 |
- INSTALL(FILES ${HEADERS} DESTINATION |
270 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/) |
271 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/) |
272 |
- |
273 |
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt |
274 |
-index e9c2a8c..2353f6c 100644 |
275 |
---- a/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt |
276 |
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt |
277 |
-@@ -35,5 +35,5 @@ ENDIF() |
278 |
- |
279 |
- |
280 |
- INSTALL(FILES ${HEADERS} DESTINATION |
281 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/) |
282 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/) |
283 |
- |
284 |
-diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt |
285 |
-index 63ae85d..3978bf5 100644 |
286 |
---- a/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt |
287 |
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt |
288 |
-@@ -35,5 +35,5 @@ ENDIF() |
289 |
- |
290 |
- |
291 |
- INSTALL(FILES ${HEADERS} DESTINATION |
292 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/) |
293 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/) |
294 |
- |
295 |
-diff --git a/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt b/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt |
296 |
-index 90ab292..930279b 100644 |
297 |
---- a/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt |
298 |
-+++ b/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt |
299 |
-@@ -47,4 +47,4 @@ TRIBITS_ADD_LIBRARY( |
300 |
- ) |
301 |
- |
302 |
- INSTALL(FILES ${HEADERS} DESTINATION |
303 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/) |
304 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/) |
305 |
-diff --git a/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt b/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt |
306 |
-index 2582b19..2f35d7a 100644 |
307 |
---- a/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt |
308 |
-+++ b/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt |
309 |
-@@ -19,4 +19,4 @@ TRIBITS_ADD_LIBRARY( |
310 |
- ) |
311 |
- |
312 |
- INSTALL(FILES ${HEADERS} DESTINATION |
313 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils) |
314 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils) |
315 |
-diff --git a/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt b/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt |
316 |
-index a70b0b8..3f8d6ac 100644 |
317 |
---- a/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt |
318 |
-+++ b/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt |
319 |
-@@ -63,4 +63,4 @@ TRIBITS_ADD_LIBRARY( |
320 |
- ) |
321 |
- |
322 |
- INSTALL(FILES ${HEADERS} DESTINATION |
323 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) |
324 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) |
325 |
-diff --git a/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt b/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt |
326 |
-index 55a388e..9a5cbfb 100644 |
327 |
---- a/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt |
328 |
-+++ b/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt |
329 |
-@@ -35,5 +35,5 @@ ENDIF() |
330 |
- |
331 |
- |
332 |
- INSTALL(FILES ${HEADERS} DESTINATION |
333 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/) |
334 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/) |
335 |
- |
336 |
-diff --git a/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt b/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt |
337 |
-index 33de7e0..d904256 100644 |
338 |
---- a/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt |
339 |
-+++ b/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt |
340 |
-@@ -55,4 +55,4 @@ TRIBITS_ADD_LIBRARY( |
341 |
- ) |
342 |
- |
343 |
- #INSTALL(FILES ${HEADERS} DESTINATION |
344 |
--# ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) |
345 |
-+# ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) |
346 |
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt |
347 |
-index 4a91d34..c00793d 100644 |
348 |
---- a/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt |
349 |
-+++ b/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt |
350 |
-@@ -16,6 +16,6 @@ ENDIF() |
351 |
- TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) |
352 |
- |
353 |
- INSTALL(FILES stk_config.h DESTINATION |
354 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) |
355 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) |
356 |
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STKClassic_config.h DESTINATION |
357 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
358 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
359 |
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt |
360 |
-index 354b70c..5b8ec85 100644 |
361 |
---- a/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt |
362 |
-+++ b/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt |
363 |
-@@ -83,5 +83,5 @@ TRIBITS_ADD_LIBRARY( |
364 |
- |
365 |
- |
366 |
- INSTALL(FILES ${HEADERS} DESTINATION |
367 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/) |
368 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/) |
369 |
- |
370 |
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt |
371 |
-index 3d295e3..aa5869c 100644 |
372 |
---- a/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt |
373 |
-+++ b/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt |
374 |
-@@ -81,4 +81,4 @@ TRIBITS_ADD_LIBRARY( |
375 |
- ) |
376 |
- |
377 |
- INSTALL(FILES ${HEADERS} DESTINATION |
378 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/) |
379 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/) |
380 |
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt |
381 |
-index f441b60..e64f34d 100644 |
382 |
---- a/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt |
383 |
-+++ b/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt |
384 |
-@@ -62,4 +62,4 @@ TRIBITS_ADD_LIBRARY( |
385 |
- ) |
386 |
- |
387 |
- INSTALL(FILES ${HEADERS} DESTINATION |
388 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/) |
389 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/) |
390 |
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt |
391 |
-index 11fb404..b2225e3 100644 |
392 |
---- a/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt |
393 |
-+++ b/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt |
394 |
-@@ -51,4 +51,4 @@ TRIBITS_ADD_LIBRARY( |
395 |
- ) |
396 |
- |
397 |
- INSTALL(FILES ${HEADERS} DESTINATION |
398 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/) |
399 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/) |
400 |
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt |
401 |
-index ed25e41..9314e7a 100644 |
402 |
---- a/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt |
403 |
-+++ b/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt |
404 |
-@@ -50,4 +50,4 @@ TRIBITS_ADD_LIBRARY( |
405 |
- ) |
406 |
- |
407 |
- #INSTALL(FILES ${HEADERS} DESTINATION |
408 |
--# ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/) |
409 |
-+# ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/) |
410 |
-diff --git a/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt |
411 |
-index 56b7873..8d83357 100644 |
412 |
---- a/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt |
413 |
-+++ b/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt |
414 |
-@@ -47,4 +47,4 @@ TRIBITS_ADD_LIBRARY( |
415 |
- ) |
416 |
- |
417 |
- INSTALL(FILES ${HEADERS} DESTINATION |
418 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/) |
419 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/) |
420 |
-diff --git a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt |
421 |
-index 467dfa1..605aefd 100644 |
422 |
---- a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt |
423 |
-+++ b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt |
424 |
-@@ -78,4 +78,4 @@ TRIBITS_ADD_LIBRARY( |
425 |
- ) |
426 |
- |
427 |
- INSTALL(FILES ${HEADERS} DESTINATION |
428 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval) |
429 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval) |
430 |
-diff --git a/packages/stk/stk_io/stk_io/CMakeLists.txt b/packages/stk/stk_io/stk_io/CMakeLists.txt |
431 |
-index 1cc9609..16e1fe0 100644 |
432 |
---- a/packages/stk/stk_io/stk_io/CMakeLists.txt |
433 |
-+++ b/packages/stk/stk_io/stk_io/CMakeLists.txt |
434 |
-@@ -80,7 +80,7 @@ TRIBITS_ADD_LIBRARY( |
435 |
- ) |
436 |
- |
437 |
- INSTALL(FILES ${HEADERS} DESTINATION |
438 |
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/) |
439 |
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/) |
440 |
- |
441 |
- # AGS: I moved this to the bottom so that the link order was correct |
442 |
- # with -lstk_io_uti before -lstk_io. I think the DEPLIBS added in |
443 |
-diff --git a/packages/stk/stk_io/stk_io/util/CMakeLists.txt b/packages/stk/stk_io/stk_io/util/CMakeLists.txt |
444 |
-index beee08b..1d78255 100644 |
445 |
---- a/packages/stk/stk_io/stk_io/util/CMakeLists.txt |
446 |
-+++ b/packages/stk/stk_io/stk_io/util/CMakeLists.txt |
447 |
-@@ -77,4 +77,4 @@ TRIBITS_ADD_LIBRARY( |
448 |
- ) |
449 |
- |
450 |
- INSTALL(FILES ${HEADERS} DESTINATION |
451 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/) |
452 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/) |
453 |
-diff --git a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt |
454 |
-index 5db69c1..9e60c2e 100644 |
455 |
---- a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt |
456 |
-+++ b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt |
457 |
-@@ -80,7 +80,7 @@ TRIBITS_ADD_LIBRARY( |
458 |
- ) |
459 |
- |
460 |
- INSTALL(FILES ${HEADERS} DESTINATION |
461 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/) |
462 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/) |
463 |
- |
464 |
- INSTALL(FILES ${HEADERS_IMPL} DESTINATION |
465 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/) |
466 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/) |
467 |
-diff --git a/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt |
468 |
-index f28c06c..c5e817e 100644 |
469 |
---- a/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt |
470 |
-+++ b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt |
471 |
-@@ -72,4 +72,4 @@ TRIBITS_ADD_LIBRARY( |
472 |
- ) |
473 |
- |
474 |
- INSTALL(FILES ${HEADERS} DESTINATION |
475 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) |
476 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) |
477 |
-diff --git a/packages/stk/stk_search/stk_search/CMakeLists.txt b/packages/stk/stk_search/stk_search/CMakeLists.txt |
478 |
-index ae6cc04..199c82f 100644 |
479 |
---- a/packages/stk/stk_search/stk_search/CMakeLists.txt |
480 |
-+++ b/packages/stk/stk_search/stk_search/CMakeLists.txt |
481 |
-@@ -69,4 +69,4 @@ TRIBITS_ADD_LIBRARY( |
482 |
- ) |
483 |
- |
484 |
- INSTALL(FILES ${HEADERS} DESTINATION |
485 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) |
486 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) |
487 |
-diff --git a/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt b/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt |
488 |
-index ca6e439..dd460d4 100644 |
489 |
---- a/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt |
490 |
-+++ b/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt |
491 |
-@@ -68,5 +68,5 @@ TRIBITS_ADD_LIBRARY( |
492 |
- ) |
493 |
- |
494 |
- INSTALL(FILES ${HEADERS} DESTINATION |
495 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util) |
496 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util) |
497 |
- |
498 |
-diff --git a/packages/stk/stk_topology/stk_topology/CMakeLists.txt b/packages/stk/stk_topology/stk_topology/CMakeLists.txt |
499 |
-index 7364267..f1d03d3 100644 |
500 |
---- a/packages/stk/stk_topology/stk_topology/CMakeLists.txt |
501 |
-+++ b/packages/stk/stk_topology/stk_topology/CMakeLists.txt |
502 |
-@@ -72,7 +72,7 @@ TRIBITS_ADD_LIBRARY( |
503 |
- ) |
504 |
- |
505 |
- INSTALL(FILES ${HEADERS} DESTINATION |
506 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/) |
507 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/) |
508 |
- |
509 |
- INSTALL(FILES ${DETAIL_HEADERS} DESTINATION |
510 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail) |
511 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail) |
512 |
-diff --git a/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt b/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt |
513 |
-index 667cb5d..ce11394 100644 |
514 |
---- a/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt |
515 |
-+++ b/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt |
516 |
-@@ -5,4 +5,4 @@ |
517 |
- FILE(GLOB HEADERS *.hpp) |
518 |
- |
519 |
- INSTALL(FILES ${HEADERS} DESTINATION |
520 |
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/) |
521 |
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/) |
522 |
-diff --git a/packages/stk/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_util/stk_util/CMakeLists.txt |
523 |
-index 02f4bf2..e95b05c 100644 |
524 |
---- a/packages/stk/stk_util/stk_util/CMakeLists.txt |
525 |
-+++ b/packages/stk/stk_util/stk_util/CMakeLists.txt |
526 |
-@@ -18,6 +18,6 @@ TRIBITS_CONFIGURE_FILE(STK_Trilinos_config.h) |
527 |
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) |
528 |
- |
529 |
- INSTALL(FILES stk_config.h DESTINATION |
530 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) |
531 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) |
532 |
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STK_Trilinos_config.h DESTINATION |
533 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) |
534 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) |
535 |
-diff --git a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt |
536 |
-index 32115b6..184062a 100644 |
537 |
---- a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt |
538 |
-+++ b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt |
539 |
-@@ -76,5 +76,5 @@ TRIBITS_ADD_LIBRARY( |
540 |
- |
541 |
- |
542 |
- INSTALL(FILES ${HEADERS} DESTINATION |
543 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/) |
544 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/) |
545 |
- |
546 |
-diff --git a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt |
547 |
-index f3ecc5d..8268018 100644 |
548 |
---- a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt |
549 |
-+++ b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt |
550 |
-@@ -74,4 +74,4 @@ TRIBITS_ADD_LIBRARY( |
551 |
- ) |
552 |
- |
553 |
- INSTALL(FILES ${HEADERS} DESTINATION |
554 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/) |
555 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/) |
556 |
-diff --git a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt |
557 |
-index 51e11fd..dba3e15 100644 |
558 |
---- a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt |
559 |
-+++ b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt |
560 |
-@@ -93,4 +93,4 @@ TRIBITS_ADD_LIBRARY( |
561 |
- ) |
562 |
- |
563 |
- INSTALL(FILES ${HEADERS} DESTINATION |
564 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/) |
565 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/) |
566 |
-diff --git a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt |
567 |
-index 2fa8a9b..dbc5000 100644 |
568 |
---- a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt |
569 |
-+++ b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt |
570 |
-@@ -71,5 +71,5 @@ TRIBITS_ADD_LIBRARY( |
571 |
- |
572 |
- |
573 |
- INSTALL(FILES ${HEADERS} DESTINATION |
574 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/) |
575 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/) |
576 |
- |
577 |
-diff --git a/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt b/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt |
578 |
-index 4a39491..ed521a4 100644 |
579 |
---- a/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt |
580 |
-+++ b/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt |
581 |
-@@ -79,4 +79,4 @@ TRIBITS_ADD_LIBRARY( |
582 |
- ) |
583 |
- |
584 |
- INSTALL(FILES ${HEADERS} DESTINATION |
585 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/) |
586 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/) |
587 |
-diff --git a/packages/stk/stk_util/stk_util/util/CMakeLists.txt b/packages/stk/stk_util/stk_util/util/CMakeLists.txt |
588 |
-index b12d75e..054f60d 100644 |
589 |
---- a/packages/stk/stk_util/stk_util/util/CMakeLists.txt |
590 |
-+++ b/packages/stk/stk_util/stk_util/util/CMakeLists.txt |
591 |
-@@ -76,4 +76,4 @@ TRIBITS_ADD_LIBRARY( |
592 |
- ) |
593 |
- |
594 |
- INSTALL(FILES ${HEADERS} DESTINATION |
595 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/) |
596 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/) |
597 |
-diff --git a/packages/teuchos/kokkoscompat/src/CMakeLists.txt b/packages/teuchos/kokkoscompat/src/CMakeLists.txt |
598 |
-index 44e6593..7048850 100644 |
599 |
---- a/packages/teuchos/kokkoscompat/src/CMakeLists.txt |
600 |
-+++ b/packages/teuchos/kokkoscompat/src/CMakeLists.txt |
601 |
-@@ -35,7 +35,7 @@ ENDIF() |
602 |
- # FIXME (mfh 19 Dec 2014) We should rely on TriBITS to handle |
603 |
- # installation. |
604 |
- |
605 |
--SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
606 |
-+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
607 |
- |
608 |
- INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/) |
609 |
- |
610 |
-diff --git a/packages/trios/libraries/support/CMakeLists.txt b/packages/trios/libraries/support/CMakeLists.txt |
611 |
-index 3b8c4fd..175f736 100644 |
612 |
---- a/packages/trios/libraries/support/CMakeLists.txt |
613 |
-+++ b/packages/trios/libraries/support/CMakeLists.txt |
614 |
-@@ -168,6 +168,6 @@ TRIBITS_ADD_LIBRARY( |
615 |
- |
616 |
- ########### install targets ############### |
617 |
- |
618 |
--# INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) |
619 |
-+# INSTALL(FILES ${MODULES} DESTINATION include) |
620 |
- |
621 |
- TRIBITS_SUBPACKAGE_POSTPROCESS() |
622 |
-diff --git a/packages/zoltan/src/CMakeLists.txt b/packages/zoltan/src/CMakeLists.txt |
623 |
-index c312433..8a52ec4 100644 |
624 |
---- a/packages/zoltan/src/CMakeLists.txt |
625 |
-+++ b/packages/zoltan/src/CMakeLists.txt |
626 |
-@@ -678,5 +678,5 @@ TRIBITS_ADD_LIBRARY( |
627 |
- IMPORTEDLIBS ${IMPORTEDLIBS} |
628 |
- ) |
629 |
- |
630 |
--INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) |
631 |
-+INSTALL(FILES ${MODULES} DESTINATION include) |
632 |
- |
633 |
-diff --git a/packages/zoltan/src/fdriver/CMakeLists.txt b/packages/zoltan/src/fdriver/CMakeLists.txt |
634 |
-index 64345d3..e60c2e3 100644 |
635 |
---- a/packages/zoltan/src/fdriver/CMakeLists.txt |
636 |
-+++ b/packages/zoltan/src/fdriver/CMakeLists.txt |
637 |
-@@ -35,6 +35,6 @@ TRIBITS_ADD_EXECUTABLE( |
638 |
- |
639 |
- # What is a good location for executables zdrive and zCPPdrive? |
640 |
- # When should they be moved there? During install? Or build? |
641 |
--#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) |
642 |
-+#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION bin) |
643 |
- |
644 |
- ENDIF() |
645 |
|
646 |
diff --git a/sci-libs/trilinos/files/trilinos-12.10.1-fix_gcc_7.patch b/sci-libs/trilinos/files/trilinos-12.10.1-fix_gcc_7.patch |
647 |
deleted file mode 100644 |
648 |
index cb005cbd3..000000000 |
649 |
--- a/sci-libs/trilinos/files/trilinos-12.10.1-fix_gcc_7.patch |
650 |
+++ /dev/null |
651 |
@@ -1,57 +0,0 @@ |
652 |
-diff --git a/packages/stk/stk_util/stk_util/diag/StringUtil.cpp b/packages/stk/stk_util/stk_util/diag/StringUtil.cpp |
653 |
-index eb9c7c1..942cfad 100644 |
654 |
---- a/packages/stk/stk_util/stk_util/diag/StringUtil.cpp |
655 |
-+++ b/packages/stk/stk_util/stk_util/diag/StringUtil.cpp |
656 |
-@@ -40,7 +40,7 @@ |
657 |
- #include <string> // for basic_string, string, etc |
658 |
- #include "stk_util/diag/String.hpp" // for String |
659 |
- |
660 |
--#if __GNUC__ == 3 || __GNUC__ == 4 || __GNUC__ == 5 || __GNUC__ == 6 |
661 |
-+#if __GNUC__ == 3 || __GNUC__ == 4 || __GNUC__ == 5 || __GNUC__ == 6 || __GNUC__ == 7 |
662 |
- #include <cxxabi.h> |
663 |
- #endif |
664 |
- |
665 |
-@@ -314,7 +314,7 @@ word_wrap( |
666 |
- #endif |
667 |
- } |
668 |
- |
669 |
-- #elif (__GNUC__ == 5) |
670 |
-+ #elif (__GNUC__ >= 5) |
671 |
- std::string |
672 |
- demangle(const char * symbol) |
673 |
- { |
674 |
-@@ -338,33 +338,8 @@ word_wrap( |
675 |
- return s; |
676 |
- #endif |
677 |
- } |
678 |
-- |
679 |
-- #elif (__GNUC__ == 6) |
680 |
-- std::string |
681 |
-- demangle(const char * symbol) |
682 |
-- { |
683 |
-- #ifdef PURIFY_BUILD |
684 |
-- return symbol; |
685 |
-- #else |
686 |
-- std::string s; |
687 |
-- |
688 |
-- int status = -1; |
689 |
-- |
690 |
-- char *demangled_symbol = abi::__cxa_demangle(symbol, 0, 0, &status); |
691 |
- |
692 |
-- if (demangled_symbol) { |
693 |
-- s = std::string(demangled_symbol); |
694 |
-- free(demangled_symbol); |
695 |
-- } |
696 |
-- |
697 |
-- if (status != 0) |
698 |
-- s = std::string(symbol); |
699 |
-- |
700 |
-- return s; |
701 |
-- #endif |
702 |
-- } |
703 |
-- |
704 |
-- #endif // (__GNUC__ == 3) |
705 |
-+ #endif |
706 |
- |
707 |
- #else |
708 |
- |
709 |
|
710 |
diff --git a/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir-2.patch b/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir-2.patch |
711 |
deleted file mode 100644 |
712 |
index 52ddc7669..000000000 |
713 |
--- a/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir-2.patch |
714 |
+++ /dev/null |
715 |
@@ -1,10 +0,0 @@ |
716 |
-diff --git a/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt |
717 |
-index 8f9fa8f..e57d25f 100644 |
718 |
---- a/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt |
719 |
-+++ b/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt |
720 |
-@@ -71,4 +71,4 @@ TRIBITS_ADD_LIBRARY( |
721 |
- ) |
722 |
- |
723 |
- INSTALL(FILES ${HEADERS} DESTINATION |
724 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) |
725 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) |
726 |
|
727 |
diff --git a/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch b/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch |
728 |
deleted file mode 100644 |
729 |
index 2e8960e23..000000000 |
730 |
--- a/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch |
731 |
+++ /dev/null |
732 |
@@ -1,603 +0,0 @@ |
733 |
-diff -Naur trilinos-12.10.1-Source.orig/commonTools/gtest/CMakeLists.txt trilinos-12.10.1-Source/commonTools/gtest/CMakeLists.txt |
734 |
---- trilinos-12.10.1-Source.orig/commonTools/gtest/CMakeLists.txt 2016-12-05 13:46:36.981584433 -0700 |
735 |
-+++ trilinos-12.10.1-Source/commonTools/gtest/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
736 |
-@@ -31,7 +31,7 @@ |
737 |
- ) |
738 |
- |
739 |
- #install gtest header into the correct subdir. |
740 |
--INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/gtest/) |
741 |
-+INSTALL(FILES ${HEADERS} DESTINATION ${Trilinos_INSTALL_INCLUDE_DIR}/gtest/) |
742 |
- |
743 |
- |
744 |
- |
745 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/kokkos/containers/src/CMakeLists.txt trilinos-12.10.1-Source/packages/kokkos/containers/src/CMakeLists.txt |
746 |
---- trilinos-12.10.1-Source.orig/packages/kokkos/containers/src/CMakeLists.txt 2016-12-05 13:46:37.071535392 -0700 |
747 |
-+++ trilinos-12.10.1-Source/packages/kokkos/containers/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
748 |
-@@ -15,7 +15,7 @@ |
749 |
- FILE(GLOB HEADERS_IMPL impl/*.hpp) |
750 |
- FILE(GLOB SOURCES impl/*.cpp) |
751 |
- |
752 |
--SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
753 |
-+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
754 |
- |
755 |
- INSTALL(FILES ${HEADERS_IMPL} DESTINATION ${TRILINOS_INCDIR}/impl/) |
756 |
- |
757 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/kokkos/core/src/CMakeLists.txt trilinos-12.10.1-Source/packages/kokkos/core/src/CMakeLists.txt |
758 |
---- trilinos-12.10.1-Source.orig/packages/kokkos/core/src/CMakeLists.txt 2016-12-05 13:46:37.061540841 -0700 |
759 |
-+++ trilinos-12.10.1-Source/packages/kokkos/core/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
760 |
-@@ -40,7 +40,7 @@ |
761 |
- |
762 |
- #----------------------------------------------------------------------------- |
763 |
- |
764 |
--SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
765 |
-+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
766 |
- |
767 |
- #----------------------------------------------------------------------------- |
768 |
- |
769 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/kokkos/core/src/impl/CMakeLists.txt trilinos-12.10.1-Source/packages/kokkos/core/src/impl/CMakeLists.txt |
770 |
---- trilinos-12.10.1-Source.orig/packages/kokkos/core/src/impl/CMakeLists.txt 2016-12-05 13:46:37.061540841 -0700 |
771 |
-+++ trilinos-12.10.1-Source/packages/kokkos/core/src/impl/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
772 |
-@@ -12,7 +12,7 @@ |
773 |
- DEPLIBS |
774 |
- ) |
775 |
- |
776 |
--SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
777 |
-+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
778 |
- |
779 |
- INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/impl/) |
780 |
- |
781 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/belos/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/belos/src/CMakeLists.txt |
782 |
---- trilinos-12.10.1-Source.orig/packages/rol/adapters/belos/src/CMakeLists.txt 2016-12-05 13:46:37.111513596 -0700 |
783 |
-+++ trilinos-12.10.1-Source/packages/rol/adapters/belos/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
784 |
-@@ -39,4 +39,4 @@ |
785 |
- ) |
786 |
- ENDIF() |
787 |
- |
788 |
--INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
789 |
-+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
790 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/epetra/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/epetra/src/CMakeLists.txt |
791 |
---- trilinos-12.10.1-Source.orig/packages/rol/adapters/epetra/src/CMakeLists.txt 2016-12-05 13:46:37.111513596 -0700 |
792 |
-+++ trilinos-12.10.1-Source/packages/rol/adapters/epetra/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
793 |
-@@ -42,4 +42,4 @@ |
794 |
- ) |
795 |
- ENDIF() |
796 |
- |
797 |
--INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
798 |
-+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
799 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/sacado/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/sacado/src/CMakeLists.txt |
800 |
---- trilinos-12.10.1-Source.orig/packages/rol/adapters/sacado/src/CMakeLists.txt 2016-12-05 13:46:37.101519046 -0700 |
801 |
-+++ trilinos-12.10.1-Source/packages/rol/adapters/sacado/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
802 |
-@@ -37,4 +37,4 @@ |
803 |
- ) |
804 |
- ENDIF() |
805 |
- |
806 |
--INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
807 |
-+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
808 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/teuchos/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/teuchos/src/CMakeLists.txt |
809 |
---- trilinos-12.10.1-Source.orig/packages/rol/adapters/teuchos/src/CMakeLists.txt 2016-12-05 13:46:37.101519046 -0700 |
810 |
-+++ trilinos-12.10.1-Source/packages/rol/adapters/teuchos/src/CMakeLists.txt 2016-12-05 14:37:03.361602958 -0700 |
811 |
-@@ -35,4 +35,4 @@ |
812 |
- ) |
813 |
- |
814 |
- |
815 |
--INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
816 |
-+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
817 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/thyra/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/thyra/src/CMakeLists.txt |
818 |
---- trilinos-12.10.1-Source.orig/packages/rol/adapters/thyra/src/CMakeLists.txt 2016-12-05 13:46:37.111513596 -0700 |
819 |
-+++ trilinos-12.10.1-Source/packages/rol/adapters/thyra/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
820 |
-@@ -49,4 +49,4 @@ |
821 |
- ) |
822 |
- ENDIF() |
823 |
- |
824 |
--INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
825 |
-+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
826 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/tpetra/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/tpetra/src/CMakeLists.txt |
827 |
---- trilinos-12.10.1-Source.orig/packages/rol/adapters/tpetra/src/CMakeLists.txt 2016-12-05 13:46:37.111513596 -0700 |
828 |
-+++ trilinos-12.10.1-Source/packages/rol/adapters/tpetra/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
829 |
-@@ -46,4 +46,4 @@ |
830 |
- ) |
831 |
- ENDIF() |
832 |
- |
833 |
--INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
834 |
-+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
835 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt |
836 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 |
837 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
838 |
-@@ -46,7 +46,7 @@ |
839 |
- ) |
840 |
- |
841 |
- INSTALL(FILES ${HEADERS} DESTINATION |
842 |
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/) |
843 |
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/) |
844 |
- |
845 |
- ADD_SUBDIRECTORY(main) |
846 |
- |
847 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt |
848 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 |
849 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
850 |
-@@ -34,5 +34,5 @@ |
851 |
- |
852 |
- |
853 |
- INSTALL(FILES ${HEADERS} DESTINATION |
854 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/) |
855 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/) |
856 |
- |
857 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt |
858 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 |
859 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
860 |
-@@ -21,5 +21,5 @@ |
861 |
- ) |
862 |
- |
863 |
- INSTALL(FILES ${HEADERS} DESTINATION |
864 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/) |
865 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/) |
866 |
- |
867 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt |
868 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 |
869 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
870 |
-@@ -46,4 +46,4 @@ |
871 |
- ) |
872 |
- |
873 |
- INSTALL(FILES ${HEADERS} DESTINATION |
874 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval) |
875 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval) |
876 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt |
877 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 |
878 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
879 |
-@@ -49,7 +49,7 @@ |
880 |
- ) |
881 |
- |
882 |
- INSTALL(FILES ${HEADERS} DESTINATION |
883 |
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/) |
884 |
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/) |
885 |
- |
886 |
- # AGS: I moved this to the bottom so that the link order was correct |
887 |
- # with -lstk_io_uti before -lstk_io. I think the DEPLIBS added in |
888 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt |
889 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 |
890 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
891 |
-@@ -45,4 +45,4 @@ |
892 |
- ) |
893 |
- |
894 |
- INSTALL(FILES ${HEADERS} DESTINATION |
895 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/) |
896 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/) |
897 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt |
898 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 |
899 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
900 |
-@@ -54,7 +54,7 @@ |
901 |
- ) |
902 |
- |
903 |
- INSTALL(FILES ${HEADERS} DESTINATION |
904 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/) |
905 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/) |
906 |
- |
907 |
- INSTALL(FILES ${HEADERS_IMPL} DESTINATION |
908 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/) |
909 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/) |
910 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt |
911 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 |
912 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
913 |
-@@ -48,5 +48,5 @@ |
914 |
- ) |
915 |
- |
916 |
- INSTALL(FILES ${HEADERS} DESTINATION |
917 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/) |
918 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/) |
919 |
- |
920 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt |
921 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 |
922 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
923 |
-@@ -54,4 +54,4 @@ |
924 |
- ) |
925 |
- |
926 |
- INSTALL(FILES ${HEADERS} DESTINATION |
927 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) |
928 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) |
929 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt |
930 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 |
931 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
932 |
-@@ -68,5 +68,5 @@ |
933 |
- ) |
934 |
- |
935 |
- INSTALL(FILES ${HEADERS} DESTINATION |
936 |
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/) |
937 |
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/) |
938 |
- |
939 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt |
940 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 |
941 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
942 |
-@@ -35,5 +35,5 @@ |
943 |
- |
944 |
- |
945 |
- INSTALL(FILES ${HEADERS} DESTINATION |
946 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/) |
947 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/) |
948 |
- |
949 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt |
950 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 |
951 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
952 |
-@@ -37,5 +37,5 @@ |
953 |
- |
954 |
- |
955 |
- INSTALL(FILES ${HEADERS} DESTINATION |
956 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/) |
957 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/) |
958 |
- |
959 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt |
960 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 |
961 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
962 |
-@@ -36,5 +36,5 @@ |
963 |
- |
964 |
- |
965 |
- INSTALL(FILES ${HEADERS} DESTINATION |
966 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/) |
967 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/) |
968 |
- |
969 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt |
970 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 |
971 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
972 |
-@@ -35,5 +35,5 @@ |
973 |
- |
974 |
- |
975 |
- INSTALL(FILES ${HEADERS} DESTINATION |
976 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/) |
977 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/) |
978 |
- |
979 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt |
980 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 |
981 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 |
982 |
-@@ -35,5 +35,5 @@ |
983 |
- |
984 |
- |
985 |
- INSTALL(FILES ${HEADERS} DESTINATION |
986 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/) |
987 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/) |
988 |
- |
989 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt |
990 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 |
991 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
992 |
-@@ -35,5 +35,5 @@ |
993 |
- |
994 |
- |
995 |
- INSTALL(FILES ${HEADERS} DESTINATION |
996 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/) |
997 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/) |
998 |
- |
999 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt |
1000 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 |
1001 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1002 |
-@@ -35,5 +35,5 @@ |
1003 |
- |
1004 |
- |
1005 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1006 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/) |
1007 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/) |
1008 |
- |
1009 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt |
1010 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 |
1011 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1012 |
-@@ -46,4 +46,4 @@ |
1013 |
- ) |
1014 |
- |
1015 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1016 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/) |
1017 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/) |
1018 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt |
1019 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 |
1020 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1021 |
-@@ -18,4 +18,4 @@ |
1022 |
- ) |
1023 |
- |
1024 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1025 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils) |
1026 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils) |
1027 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt |
1028 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 |
1029 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1030 |
-@@ -62,4 +62,4 @@ |
1031 |
- ) |
1032 |
- |
1033 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1034 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) |
1035 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) |
1036 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt |
1037 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 |
1038 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1039 |
-@@ -34,5 +34,5 @@ |
1040 |
- |
1041 |
- |
1042 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1043 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/) |
1044 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/) |
1045 |
- |
1046 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt |
1047 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 |
1048 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1049 |
-@@ -54,4 +54,4 @@ |
1050 |
- ) |
1051 |
- |
1052 |
- #INSTALL(FILES ${HEADERS} DESTINATION |
1053 |
--# ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) |
1054 |
-+# ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) |
1055 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt |
1056 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 |
1057 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1058 |
-@@ -16,6 +16,6 @@ |
1059 |
- TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) |
1060 |
- |
1061 |
- INSTALL(FILES stk_config.h DESTINATION |
1062 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) |
1063 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) |
1064 |
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STKClassic_config.h DESTINATION |
1065 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
1066 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
1067 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt |
1068 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 |
1069 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1070 |
-@@ -82,5 +82,5 @@ |
1071 |
- |
1072 |
- |
1073 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1074 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/) |
1075 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/) |
1076 |
- |
1077 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt |
1078 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 |
1079 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1080 |
-@@ -80,4 +80,4 @@ |
1081 |
- ) |
1082 |
- |
1083 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1084 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/) |
1085 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/) |
1086 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt |
1087 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 |
1088 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1089 |
-@@ -61,4 +61,4 @@ |
1090 |
- ) |
1091 |
- |
1092 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1093 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/) |
1094 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/) |
1095 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt |
1096 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 |
1097 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1098 |
-@@ -50,4 +50,4 @@ |
1099 |
- ) |
1100 |
- |
1101 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1102 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/) |
1103 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/) |
1104 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt |
1105 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 |
1106 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1107 |
-@@ -49,4 +49,4 @@ |
1108 |
- ) |
1109 |
- |
1110 |
- #INSTALL(FILES ${HEADERS} DESTINATION |
1111 |
--# ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/) |
1112 |
-+# ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/) |
1113 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt |
1114 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 |
1115 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1116 |
-@@ -46,4 +46,4 @@ |
1117 |
- ) |
1118 |
- |
1119 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1120 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/) |
1121 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/) |
1122 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt |
1123 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700 |
1124 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1125 |
-@@ -77,4 +77,4 @@ |
1126 |
- ) |
1127 |
- |
1128 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1129 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval) |
1130 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval) |
1131 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/CMakeLists.txt |
1132 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 |
1133 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1134 |
-@@ -78,7 +78,7 @@ |
1135 |
- ) |
1136 |
- |
1137 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1138 |
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/) |
1139 |
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/) |
1140 |
- |
1141 |
- # AGS: I moved this to the bottom so that the link order was correct |
1142 |
- # with -lstk_io_uti before -lstk_io. I think the DEPLIBS added in |
1143 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/util/CMakeLists.txt |
1144 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/util/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 |
1145 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1146 |
-@@ -76,4 +76,4 @@ |
1147 |
- ) |
1148 |
- |
1149 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1150 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/) |
1151 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/) |
1152 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt |
1153 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt 2016-12-05 13:46:37.421344676 -0700 |
1154 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1155 |
-@@ -84,14 +84,13 @@ |
1156 |
- TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) |
1157 |
- |
1158 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1159 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/) |
1160 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/) |
1161 |
- |
1162 |
- INSTALL(FILES ${HEADERS_IMPL} DESTINATION |
1163 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/) |
1164 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/) |
1165 |
- |
1166 |
- INSTALL(FILES ${HEADERS_ELEMGRAPH} DESTINATION |
1167 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/elementGraph) |
1168 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/elementGraph) |
1169 |
- |
1170 |
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h DESTINATION |
1171 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
1172 |
-- |
1173 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
1174 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt |
1175 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt 2016-12-05 13:46:37.421344676 -0700 |
1176 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1177 |
-@@ -71,4 +71,4 @@ |
1178 |
- ) |
1179 |
- |
1180 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1181 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) |
1182 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) |
1183 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_search/stk_search/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_search/stk_search/CMakeLists.txt |
1184 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_search/stk_search/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 |
1185 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_search/stk_search/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1186 |
-@@ -69,4 +69,4 @@ |
1187 |
- ) |
1188 |
- |
1189 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1190 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) |
1191 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) |
1192 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt |
1193 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt 2016-12-05 13:46:37.431339227 -0700 |
1194 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1195 |
-@@ -68,5 +68,5 @@ |
1196 |
- ) |
1197 |
- |
1198 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1199 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util) |
1200 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util) |
1201 |
- |
1202 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_topology/stk_topology/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_topology/stk_topology/CMakeLists.txt |
1203 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_topology/stk_topology/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 |
1204 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_topology/stk_topology/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1205 |
-@@ -71,7 +71,7 @@ |
1206 |
- ) |
1207 |
- |
1208 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1209 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/) |
1210 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/) |
1211 |
- |
1212 |
- INSTALL(FILES ${DETAIL_HEADERS} DESTINATION |
1213 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail) |
1214 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail) |
1215 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt |
1216 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt 2016-12-05 13:46:37.431339227 -0700 |
1217 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1218 |
-@@ -5,4 +5,4 @@ |
1219 |
- FILE(GLOB HEADERS *.hpp) |
1220 |
- |
1221 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1222 |
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/) |
1223 |
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/) |
1224 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/CMakeLists.txt |
1225 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700 |
1226 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/CMakeLists.txt 2016-12-05 13:56:03.782564712 -0700 |
1227 |
-@@ -18,6 +18,6 @@ |
1228 |
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) |
1229 |
- |
1230 |
- INSTALL(FILES stk_config.h stk_kokkos_macros.h DESTINATION |
1231 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) |
1232 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) |
1233 |
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STK_Trilinos_config.h DESTINATION |
1234 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) |
1235 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) |
1236 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/diag/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/diag/CMakeLists.txt |
1237 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/diag/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700 |
1238 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/diag/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1239 |
-@@ -75,5 +75,5 @@ |
1240 |
- |
1241 |
- |
1242 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1243 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/) |
1244 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/) |
1245 |
- |
1246 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/environment/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/environment/CMakeLists.txt |
1247 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/environment/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700 |
1248 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/environment/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1249 |
-@@ -73,4 +73,4 @@ |
1250 |
- ) |
1251 |
- |
1252 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1253 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/) |
1254 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/) |
1255 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt |
1256 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700 |
1257 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1258 |
-@@ -92,4 +92,4 @@ |
1259 |
- ) |
1260 |
- |
1261 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1262 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/) |
1263 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/) |
1264 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/registry/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/registry/CMakeLists.txt |
1265 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/registry/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700 |
1266 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/registry/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1267 |
-@@ -70,5 +70,5 @@ |
1268 |
- |
1269 |
- |
1270 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1271 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/) |
1272 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/) |
1273 |
- |
1274 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt |
1275 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700 |
1276 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1277 |
-@@ -78,4 +78,4 @@ |
1278 |
- ) |
1279 |
- |
1280 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1281 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/) |
1282 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/) |
1283 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/util/CMakeLists.txt |
1284 |
---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/util/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700 |
1285 |
-+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1286 |
-@@ -75,4 +75,4 @@ |
1287 |
- ) |
1288 |
- |
1289 |
- INSTALL(FILES ${HEADERS} DESTINATION |
1290 |
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/) |
1291 |
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/) |
1292 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/teuchos/kokkoscompat/src/CMakeLists.txt trilinos-12.10.1-Source/packages/teuchos/kokkoscompat/src/CMakeLists.txt |
1293 |
---- trilinos-12.10.1-Source.orig/packages/teuchos/kokkoscompat/src/CMakeLists.txt 2016-12-05 13:46:37.371371921 -0700 |
1294 |
-+++ trilinos-12.10.1-Source/packages/teuchos/kokkoscompat/src/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1295 |
-@@ -27,7 +27,7 @@ |
1296 |
- # FIXME (mfh 19 Dec 2014) We should rely on TriBITS to handle |
1297 |
- # installation. |
1298 |
- |
1299 |
--SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
1300 |
-+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) |
1301 |
- |
1302 |
- INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/) |
1303 |
- |
1304 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/trios/libraries/support/CMakeLists.txt trilinos-12.10.1-Source/packages/trios/libraries/support/CMakeLists.txt |
1305 |
---- trilinos-12.10.1-Source.orig/packages/trios/libraries/support/CMakeLists.txt 2016-12-05 13:46:37.531284737 -0700 |
1306 |
-+++ trilinos-12.10.1-Source/packages/trios/libraries/support/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1307 |
-@@ -168,6 +168,6 @@ |
1308 |
- |
1309 |
- ########### install targets ############### |
1310 |
- |
1311 |
--# INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) |
1312 |
-+# INSTALL(FILES ${MODULES} DESTINATION include) |
1313 |
- |
1314 |
- TRIBITS_SUBPACKAGE_POSTPROCESS() |
1315 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/zoltan/src/CMakeLists.txt trilinos-12.10.1-Source/packages/zoltan/src/CMakeLists.txt |
1316 |
---- trilinos-12.10.1-Source.orig/packages/zoltan/src/CMakeLists.txt 2016-12-05 13:46:37.231448208 -0700 |
1317 |
-+++ trilinos-12.10.1-Source/packages/zoltan/src/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1318 |
-@@ -678,5 +678,5 @@ |
1319 |
- IMPORTEDLIBS ${IMPORTEDLIBS} |
1320 |
- ) |
1321 |
- |
1322 |
--INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) |
1323 |
-+INSTALL(FILES ${MODULES} DESTINATION include) |
1324 |
- |
1325 |
-diff -Naur trilinos-12.10.1-Source.orig/packages/zoltan/src/fdriver/CMakeLists.txt trilinos-12.10.1-Source/packages/zoltan/src/fdriver/CMakeLists.txt |
1326 |
---- trilinos-12.10.1-Source.orig/packages/zoltan/src/fdriver/CMakeLists.txt 2016-12-05 13:46:37.231448208 -0700 |
1327 |
-+++ trilinos-12.10.1-Source/packages/zoltan/src/fdriver/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 |
1328 |
-@@ -33,6 +33,6 @@ |
1329 |
- |
1330 |
- # What is a good location for executables zdrive and zCPPdrive? |
1331 |
- # When should they be moved there? During install? Or build? |
1332 |
--#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) |
1333 |
-+#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION bin) |
1334 |
- |
1335 |
- ENDIF() |
1336 |
|
1337 |
diff --git a/sci-libs/trilinos/trilinos-11.14.1-r1.ebuild b/sci-libs/trilinos/trilinos-11.14.1-r1.ebuild |
1338 |
deleted file mode 100644 |
1339 |
index 0712f8623..000000000 |
1340 |
--- a/sci-libs/trilinos/trilinos-11.14.1-r1.ebuild |
1341 |
+++ /dev/null |
1342 |
@@ -1,207 +0,0 @@ |
1343 |
-# Copyright 1999-2016 Gentoo Foundation |
1344 |
-# Distributed under the terms of the GNU General Public License v2 |
1345 |
- |
1346 |
-EAPI=5 |
1347 |
- |
1348 |
-inherit cmake-utils toolchain-funcs multilib toolchain-funcs |
1349 |
- |
1350 |
-DESCRIPTION="Scientific library collection for large scale problems" |
1351 |
-HOMEPAGE="http://trilinos.sandia.gov/" |
1352 |
-SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz" |
1353 |
- |
1354 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
1355 |
- |
1356 |
-LICENSE="BSD LGPL-2.1" |
1357 |
-SLOT="0" |
1358 |
- |
1359 |
-IUSE=" |
1360 |
- adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre |
1361 |
- matio metis mkl mumps netcdf petsc qd qt4 scalapack scotch sparse |
1362 |
- superlu taucs tbb test threads tvmet yaml zlib |
1363 |
-" |
1364 |
- |
1365 |
-# TODO: fix export cmake function for tests |
1366 |
-RESTRICT="test" |
1367 |
- |
1368 |
-RDEPEND=" |
1369 |
- sys-libs/binutils-libs |
1370 |
- virtual/blas |
1371 |
- virtual/lapack |
1372 |
- virtual/mpi |
1373 |
- adolc? ( sci-libs/adolc ) |
1374 |
- arprec? ( sci-libs/arprec ) |
1375 |
- boost? ( dev-libs/boost ) |
1376 |
- clp? ( sci-libs/coinor-clp ) |
1377 |
- cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 ) |
1378 |
- eigen? ( dev-cpp/eigen:3 ) |
1379 |
- gtest? ( dev-cpp/gtest ) |
1380 |
- hdf5? ( sci-libs/hdf5[mpi] ) |
1381 |
- hypre? ( sci-libs/hypre ) |
1382 |
- hwloc? ( sys-apps/hwloc ) |
1383 |
- matio? ( sci-libs/matio ) |
1384 |
- mkl? ( sci-libs/mkl ) |
1385 |
- metis? ( || ( sci-libs/parmetis sci-libs/metis ) ) |
1386 |
- mumps? ( sci-libs/mumps ) |
1387 |
- netcdf? ( sci-libs/netcdf ) |
1388 |
- petsc? ( sci-mathematics/petsc ) |
1389 |
- qd? ( sci-libs/qd ) |
1390 |
- qt4? ( dev-qt/qtgui:4 ) |
1391 |
- scalapack? ( virtual/scalapack ) |
1392 |
- scotch? ( sci-libs/scotch ) |
1393 |
- sparse? ( sci-libs/cxsparse sci-libs/umfpack ) |
1394 |
- superlu? ( sci-libs/superlu ) |
1395 |
- taucs? ( sci-libs/taucs ) |
1396 |
- tbb? ( dev-cpp/tbb ) |
1397 |
- tvmet? ( dev-libs/tvmet ) |
1398 |
- yaml? ( dev-cpp/yaml-cpp ) |
1399 |
- zlib? ( sys-libs/zlib )" |
1400 |
-DEPEND="${RDEPEND} |
1401 |
- virtual/pkgconfig" |
1402 |
- |
1403 |
-S="${WORKDIR}/${P}-Source" |
1404 |
- |
1405 |
-trilinos_conf() { |
1406 |
- local dirs libs d |
1407 |
- for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do |
1408 |
- dirs="${dirs};${d:2}" |
1409 |
- done |
1410 |
- [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" ) |
1411 |
- for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do |
1412 |
- libs="${libs};${d:2}" |
1413 |
- done |
1414 |
- [[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" ) |
1415 |
- dirs="" |
1416 |
- for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do |
1417 |
- dirs="${dirs};${d:2}" |
1418 |
- done |
1419 |
- [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" ) |
1420 |
-} |
1421 |
- |
1422 |
-trilinos_enable() { |
1423 |
- cmake-utils_use $1 TPL_ENABLE_${2:-${1^^}} |
1424 |
-} |
1425 |
- |
1426 |
-src_prepare() { |
1427 |
- epatch "${FILESDIR}"/${P}-fix-install-paths.patch |
1428 |
- epatch "${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch |
1429 |
-} |
1430 |
- |
1431 |
-src_configure() { |
1432 |
- |
1433 |
- # temporarily disable SEACAS and pyTrilinos compilation |
1434 |
- local mycmakeargs=( |
1435 |
- -DBUILD_SHARED_LIBS=ON |
1436 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}" |
1437 |
- -DTrilinos_ENABLE_ALL_PACKAGES=ON |
1438 |
- -DTrilinos_ENABLE_SEACAS=OFF |
1439 |
- -DTrilinos_ENABLE_PyTrilinos=OFF |
1440 |
- -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos" |
1441 |
- -DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos" |
1442 |
- -DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake" |
1443 |
- -DTPL_ENABLE_BinUtils=ON |
1444 |
- -DTPL_ENABLE_MPI=ON |
1445 |
- -DTPL_ENABLE_BLAS=ON |
1446 |
- -DTPL_ENABLE_LAPACK=ON |
1447 |
- $(cmake-utils_use test Trilinos_ENABLE_TESTS) |
1448 |
- $(trilinos_enable adolc) |
1449 |
- $(trilinos_enable arprec) |
1450 |
- $(trilinos_enable boost Boost) |
1451 |
- $(trilinos_enable boost BoostLib) |
1452 |
- $(trilinos_enable cppunit Cppunit) |
1453 |
- $(trilinos_enable clp Clp) |
1454 |
- $(trilinos_enable cuda) |
1455 |
- $(trilinos_enable cuda CUSPARSE) |
1456 |
- $(trilinos_enable cuda Thrust) |
1457 |
- $(trilinos_enable eigen Eigen) |
1458 |
- $(trilinos_enable gtest gtest) |
1459 |
- $(trilinos_enable glpk) |
1460 |
- $(trilinos_enable hdf5) |
1461 |
- $(trilinos_enable hwloc) |
1462 |
- $(trilinos_enable hypre) |
1463 |
- $(trilinos_enable matio) |
1464 |
- $(trilinos_enable metis) |
1465 |
- $(trilinos_enable mkl) |
1466 |
- $(trilinos_enable mkl PARDISO_MKL) |
1467 |
- $(trilinos_enable mumps) |
1468 |
- $(trilinos_enable netcdf Netcdf) |
1469 |
- $(trilinos_enable petsc) |
1470 |
- $(trilinos_enable qd) |
1471 |
- $(trilinos_enable qt4 QT) |
1472 |
- $(trilinos_enable scalapack) |
1473 |
- $(trilinos_enable scalapack BLACS) |
1474 |
- $(trilinos_enable scotch Scotch) |
1475 |
- $(trilinos_enable sparse AMD) |
1476 |
- $(trilinos_enable sparse CSparse) |
1477 |
- $(trilinos_enable sparse UMFPACK) |
1478 |
- $(trilinos_enable superlu SuperLU) |
1479 |
- $(trilinos_enable taucs) |
1480 |
- $(trilinos_enable tbb) |
1481 |
- $(trilinos_enable threads Pthread) |
1482 |
- $(trilinos_enable tvmet) |
1483 |
- $(trilinos_enable yaml yaml-cpp) |
1484 |
- $(trilinos_enable zlib Zlib) |
1485 |
- ) |
1486 |
- |
1487 |
- use eigen && \ |
1488 |
- mycmakeargs+=( |
1489 |
- -DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3" |
1490 |
- ) |
1491 |
- use hypre && \ |
1492 |
- mycmakeargs+=( |
1493 |
- -DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre" |
1494 |
- ) |
1495 |
- use scotch && \ |
1496 |
- mycmakeargs+=( |
1497 |
- -DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch" |
1498 |
- ) |
1499 |
- |
1500 |
- # cxsparse is a rewrite of csparse + extras |
1501 |
- use sparse && \ |
1502 |
- mycmakeargs+=( |
1503 |
- -DCSparse_LIBRARY_NAMES="cxsparse" |
1504 |
- ) |
1505 |
- |
1506 |
- # mandatory blas and lapack |
1507 |
- trilinos_conf blas BLAS |
1508 |
- trilinos_conf lapack LAPACK |
1509 |
- use superlu && trilinos_conf superlu SuperLU |
1510 |
- use metis && trilinos_conf metis METIS |
1511 |
- |
1512 |
- # blacs library is included in scalapack these days |
1513 |
- if use scalapack; then |
1514 |
- trilinos_conf scalapack SCALAPACK |
1515 |
- mycmakeargs+=( |
1516 |
- -DBLACS_LIBRARY_NAMES="scalapack" |
1517 |
- -DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs" |
1518 |
- ) |
1519 |
- fi |
1520 |
- |
1521 |
- # TODO: do we need that line? |
1522 |
- export CC=mpicc CXX=mpicxx && tc-export CC CXX |
1523 |
- |
1524 |
- # cmake-utils eclass patches the base directory CMakeLists.txt |
1525 |
- # which does not work for complex Trilinos CMake modules |
1526 |
- CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure |
1527 |
- |
1528 |
- # TODO: |
1529 |
- # python bindings with python-r1 |
1530 |
- # fix hypre bindings |
1531 |
- # fix hdf5 |
1532 |
- # cuda/thrust is untested |
1533 |
- # do we always need mpi? and for all packages: blah[mpi] ? |
1534 |
- # install docs, examples |
1535 |
- # see what packages are related, do we need REQUIRED_USE |
1536 |
- # proper use flags description |
1537 |
- # add more use flags/packages ? |
1538 |
-} |
1539 |
- |
1540 |
-src_install() { |
1541 |
- cmake-utils_src_install |
1542 |
- |
1543 |
- # register $(get_libdir)/trilinos in LDPATH so that the dynamic linker |
1544 |
- # has a chance to pick up the libraries... |
1545 |
- cat >> "${T}"/99trilinos <<- EOF |
1546 |
- LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos" |
1547 |
- EOF |
1548 |
- doenvd "${T}"/99trilinos |
1549 |
-} |
1550 |
|
1551 |
diff --git a/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild b/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild |
1552 |
deleted file mode 100644 |
1553 |
index b43aabad7..000000000 |
1554 |
--- a/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild |
1555 |
+++ /dev/null |
1556 |
@@ -1,220 +0,0 @@ |
1557 |
-# Copyright 1999-2017 Gentoo Foundation |
1558 |
-# Distributed under the terms of the GNU General Public License v2 |
1559 |
- |
1560 |
-EAPI=5 |
1561 |
- |
1562 |
-inherit cmake-utils toolchain-funcs multilib toolchain-funcs |
1563 |
- |
1564 |
-DESCRIPTION="Scientific library collection for large scale problems" |
1565 |
-HOMEPAGE="http://trilinos.sandia.gov/" |
1566 |
-SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz" |
1567 |
- |
1568 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
1569 |
- |
1570 |
-LICENSE="BSD LGPL-2.1" |
1571 |
-SLOT="0" |
1572 |
- |
1573 |
-IUSE=" |
1574 |
- adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre |
1575 |
- matio metis mkl mumps netcdf petsc qd qt4 scalapack scotch sparse |
1576 |
- superlu taucs tbb test threads tvmet yaml zlib X |
1577 |
-" |
1578 |
- |
1579 |
-# TODO: fix export cmake function for tests |
1580 |
-RESTRICT="test" |
1581 |
- |
1582 |
-RDEPEND=" |
1583 |
- sys-libs/binutils-libs |
1584 |
- virtual/blas |
1585 |
- virtual/lapack |
1586 |
- virtual/mpi |
1587 |
- adolc? ( sci-libs/adolc ) |
1588 |
- arprec? ( sci-libs/arprec ) |
1589 |
- boost? ( dev-libs/boost ) |
1590 |
- clp? ( sci-libs/coinor-clp ) |
1591 |
- cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 ) |
1592 |
- eigen? ( dev-cpp/eigen:3 ) |
1593 |
- gtest? ( dev-cpp/gtest ) |
1594 |
- hdf5? ( sci-libs/hdf5[mpi] ) |
1595 |
- hypre? ( sci-libs/hypre ) |
1596 |
- hwloc? ( sys-apps/hwloc ) |
1597 |
- matio? ( sci-libs/matio ) |
1598 |
- mkl? ( sci-libs/mkl ) |
1599 |
- metis? ( || ( sci-libs/parmetis sci-libs/metis ) ) |
1600 |
- mumps? ( sci-libs/mumps ) |
1601 |
- netcdf? ( sci-libs/netcdf ) |
1602 |
- petsc? ( sci-mathematics/petsc ) |
1603 |
- qd? ( sci-libs/qd ) |
1604 |
- qt4? ( dev-qt/qtgui:4 ) |
1605 |
- scalapack? ( virtual/scalapack ) |
1606 |
- scotch? ( sci-libs/scotch ) |
1607 |
- sparse? ( sci-libs/cxsparse sci-libs/umfpack ) |
1608 |
- superlu? ( sci-libs/superlu ) |
1609 |
- taucs? ( sci-libs/taucs ) |
1610 |
- tbb? ( dev-cpp/tbb ) |
1611 |
- tvmet? ( dev-libs/tvmet ) |
1612 |
- yaml? ( dev-cpp/yaml-cpp ) |
1613 |
- zlib? ( sys-libs/zlib ) |
1614 |
- X? ( x11-libs/libX11 )" |
1615 |
-DEPEND="${RDEPEND} |
1616 |
- virtual/pkgconfig" |
1617 |
- |
1618 |
-S="${WORKDIR}/${P}-Source" |
1619 |
- |
1620 |
-trilinos_conf() { |
1621 |
- local dirs libs d |
1622 |
- for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do |
1623 |
- dirs="${dirs};${d:2}" |
1624 |
- done |
1625 |
- [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" ) |
1626 |
- for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do |
1627 |
- libs="${libs};${d:2}" |
1628 |
- done |
1629 |
- [[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" ) |
1630 |
- dirs="" |
1631 |
- for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do |
1632 |
- dirs="${dirs};${d:2}" |
1633 |
- done |
1634 |
- [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" ) |
1635 |
-} |
1636 |
- |
1637 |
-trilinos_enable() { |
1638 |
- cmake-utils_use $1 TPL_ENABLE_${2:-${1^^}} |
1639 |
-} |
1640 |
- |
1641 |
-src_prepare() { |
1642 |
- epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \ |
1643 |
- "${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch \ |
1644 |
- "${FILESDIR}"/${P}-fix_install_paths_for_destdir-2.patch \ |
1645 |
- "${FILESDIR}"/${P}-fix_gcc_7.patch |
1646 |
- |
1647 |
- epatch_user |
1648 |
-} |
1649 |
- |
1650 |
-src_configure() { |
1651 |
- |
1652 |
- # temporarily disable pyTrilinos compilation |
1653 |
- local mycmakeargs=( |
1654 |
- -DBUILD_SHARED_LIBS=ON |
1655 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}" |
1656 |
- -DTrilinos_ENABLE_ALL_PACKAGES=ON |
1657 |
- -DZoltan2_ENABLE_Experimental=ON |
1658 |
- -DTrilinos_ENABLE_SEACASExodus=$(usex netcdf) |
1659 |
- -DTrilinos_ENABLE_SEACASExodiff=$(usex netcdf) |
1660 |
- -DTrilinos_ENABLE_PyTrilinos=OFF |
1661 |
- -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos" |
1662 |
- -DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos" |
1663 |
- -DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake" |
1664 |
- -DTPL_ENABLE_BinUtils=ON |
1665 |
- -DTPL_ENABLE_MPI=ON |
1666 |
- -DTPL_ENABLE_BLAS=ON |
1667 |
- -DTPL_ENABLE_LAPACK=ON |
1668 |
- $(cmake-utils_use test Trilinos_ENABLE_TESTS) |
1669 |
- $(trilinos_enable adolc) |
1670 |
- $(trilinos_enable arprec) |
1671 |
- $(trilinos_enable boost Boost) |
1672 |
- $(trilinos_enable boost BoostLib) |
1673 |
- $(trilinos_enable cppunit Cppunit) |
1674 |
- $(trilinos_enable clp Clp) |
1675 |
- $(trilinos_enable cuda) |
1676 |
- $(trilinos_enable cuda CUSPARSE) |
1677 |
- $(trilinos_enable cuda Thrust) |
1678 |
- $(trilinos_enable eigen Eigen) |
1679 |
- $(trilinos_enable gtest gtest) |
1680 |
- $(trilinos_enable glpk) |
1681 |
- $(trilinos_enable hdf5) |
1682 |
- $(trilinos_enable hwloc) |
1683 |
- $(trilinos_enable hypre) |
1684 |
- $(trilinos_enable matio Matio) |
1685 |
- $(trilinos_enable metis) |
1686 |
- $(trilinos_enable mkl) |
1687 |
- $(trilinos_enable mkl PARDISO_MKL) |
1688 |
- $(trilinos_enable mumps) |
1689 |
- $(trilinos_enable netcdf Netcdf) |
1690 |
- $(trilinos_enable petsc) |
1691 |
- $(trilinos_enable qd) |
1692 |
- $(trilinos_enable qt4 QT) |
1693 |
- $(trilinos_enable scalapack) |
1694 |
- $(trilinos_enable scalapack BLACS) |
1695 |
- $(trilinos_enable scotch Scotch) |
1696 |
- $(trilinos_enable sparse AMD) |
1697 |
- $(trilinos_enable sparse CSparse) |
1698 |
- $(trilinos_enable sparse UMFPACK) |
1699 |
- $(trilinos_enable superlu SuperLU) |
1700 |
- $(trilinos_enable taucs) |
1701 |
- $(trilinos_enable tbb) |
1702 |
- $(trilinos_enable threads Pthread) |
1703 |
- $(trilinos_enable tvmet) |
1704 |
- $(trilinos_enable yaml yaml-cpp) |
1705 |
- $(trilinos_enable zlib Zlib) |
1706 |
- $(trilinos_enable X X11) |
1707 |
- ) |
1708 |
- |
1709 |
- use eigen && \ |
1710 |
- mycmakeargs+=( |
1711 |
- -DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3" |
1712 |
- ) |
1713 |
- use hypre && \ |
1714 |
- mycmakeargs+=( |
1715 |
- -DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre" |
1716 |
- ) |
1717 |
- use scotch && \ |
1718 |
- mycmakeargs+=( |
1719 |
- -DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch" |
1720 |
- ) |
1721 |
- |
1722 |
- # cxsparse is a rewrite of csparse + extras |
1723 |
- use sparse && \ |
1724 |
- mycmakeargs+=( |
1725 |
- -DCSparse_LIBRARY_NAMES="cxsparse" |
1726 |
- ) |
1727 |
- |
1728 |
- # mandatory blas and lapack |
1729 |
- trilinos_conf blas BLAS |
1730 |
- trilinos_conf lapack LAPACK |
1731 |
- use superlu && trilinos_conf superlu SuperLU |
1732 |
- use metis && trilinos_conf metis METIS |
1733 |
- |
1734 |
- # blacs library is included in scalapack these days |
1735 |
- if use scalapack; then |
1736 |
- trilinos_conf scalapack SCALAPACK |
1737 |
- mycmakeargs+=( |
1738 |
- -DBLACS_LIBRARY_NAMES="scalapack" |
1739 |
- -DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs" |
1740 |
- ) |
1741 |
- fi |
1742 |
- |
1743 |
- # TODO: do we need that line? |
1744 |
- export CC=mpicc CXX=mpicxx && tc-export CC CXX |
1745 |
- |
1746 |
- # cmake-utils eclass patches the base directory CMakeLists.txt |
1747 |
- # which does not work for complex Trilinos CMake modules |
1748 |
- CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure |
1749 |
- |
1750 |
- # TODO: |
1751 |
- # python bindings with python-r1 |
1752 |
- # fix hypre bindings |
1753 |
- # fix hdf5 |
1754 |
- # cuda/thrust is untested |
1755 |
- # do we always need mpi? and for all packages: blah[mpi] ? |
1756 |
- # install docs, examples |
1757 |
- # see what packages are related, do we need REQUIRED_USE |
1758 |
- # proper use flags description |
1759 |
- # add more use flags/packages ? |
1760 |
-} |
1761 |
- |
1762 |
-src_install() { |
1763 |
- cmake-utils_src_install |
1764 |
- |
1765 |
- # Clean up the mess: |
1766 |
- rm -r "${ED}"/TrilinosRepoVersion.txt "${ED}"/lib || die "rm failed" |
1767 |
- mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed" |
1768 |
- |
1769 |
- # register $(get_libdir)/trilinos in LDPATH so that the dynamic linker |
1770 |
- # has a chance to pick up the libraries... |
1771 |
- cat >> "${T}"/99trilinos <<- EOF |
1772 |
- LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos" |
1773 |
- PATH="${EPREFIX}/usr/$(get_libdir)/trilinos/bin" |
1774 |
- EOF |
1775 |
- doenvd "${T}"/99trilinos |
1776 |
-} |