1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
|
diff -rupN CGNS-4.3.0/CMakeLists.txt CGNS-4.3.0-new/CMakeLists.txt
--- CGNS-4.3.0/CMakeLists.txt 2022-03-21 13:43:17.860321889 +0100
+++ CGNS-4.3.0-new/CMakeLists.txt 2022-03-21 11:40:19.595169803 +0100
@@ -424,7 +424,7 @@ if (CGNS_BUILD_SHARED)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
# the RPATH to be used when installing
- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
# add the automatically determined parts of the RPATH
# which point to directories outside the build tree to the install RPATH
diff -rupN CGNS-4.3.0/src/cgnstools/cgnscalc/CMakeLists.txt CGNS-4.3.0-new/src/cgnstools/cgnscalc/CMakeLists.txt
--- CGNS-4.3.0/src/cgnstools/cgnscalc/CMakeLists.txt 2022-03-21 13:43:17.861321883 +0100
+++ CGNS-4.3.0-new/src/cgnstools/cgnscalc/CMakeLists.txt 2022-03-21 11:40:19.595169803 +0100
@@ -59,11 +59,11 @@ endif ()
if (WIN32)
install(TARGETS
calcwish
- RUNTIME DESTINATION bin)
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR})
install(PROGRAMS
cgnscalc.bat
unitconv.bat
- DESTINATION bin)
+ DESTINATION ${BIN_INSTALL_DIR})
install(FILES
cgnscalc.tcl
unitconv.tcl
@@ -78,21 +78,21 @@ if (WIN32)
else ()
install(TARGETS
calcwish
- RUNTIME DESTINATION bin/cgnstools)
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR}/cgnstools)
install(PROGRAMS
cgnscalc.sh
- DESTINATION bin
+ DESTINATION ${BIN_INSTALL_DIR}
RENAME cgnscalc)
install(PROGRAMS
cgnscalc.desktop
- DESTINATION bin)
+ DESTINATION ${BIN_INSTALL_DIR})
install(PROGRAMS
unitconv.sh
- DESTINATION bin
+ DESTINATION ${BIN_INSTALL_DIR}
RENAME unitconv)
install(PROGRAMS
unitconv.desktop
- DESTINATION bin)
+ DESTINATION ${BIN_INSTALL_DIR})
install(FILES
cgnscalc.tcl
unitconv.tcl
diff -rupN CGNS-4.3.0/src/cgnstools/cgnsplot/CMakeLists.txt CGNS-4.3.0-new/src/cgnstools/cgnsplot/CMakeLists.txt
--- CGNS-4.3.0/src/cgnstools/cgnsplot/CMakeLists.txt 2022-03-21 13:43:17.862321878 +0100
+++ CGNS-4.3.0-new/src/cgnstools/cgnsplot/CMakeLists.txt 2022-03-21 11:40:19.595169803 +0100
@@ -66,10 +66,10 @@ endif ()
if (WIN32)
install(TARGETS
plotwish
- RUNTIME DESTINATION bin)
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR})
install(PROGRAMS
cgnsplot.bat
- DESTINATION bin)
+ DESTINATION ${BIN_INSTALL_DIR})
install(FILES
cgnsplot.tcl
cgnsplot.ico
@@ -80,14 +80,14 @@ if (WIN32)
else ()
install(TARGETS
plotwish
- RUNTIME DESTINATION bin/cgnstools)
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR}/cgnstools)
install(PROGRAMS
cgnsplot.sh
- DESTINATION bin
+ DESTINATION ${BIN_INSTALL_DIR}
RENAME cgnsplot)
install(PROGRAMS
cgnsplot.desktop
- DESTINATION bin)
+ DESTINATION ${BIN_INSTALL_DIR})
install(FILES
cgnsplot.tcl
cgnsplot.ico
diff -rupN CGNS-4.3.0/src/cgnstools/cgnsview/CMakeLists.txt CGNS-4.3.0-new/src/cgnstools/cgnsview/CMakeLists.txt
--- CGNS-4.3.0/src/cgnstools/cgnsview/CMakeLists.txt 2022-03-21 13:43:17.862321878 +0100
+++ CGNS-4.3.0-new/src/cgnstools/cgnsview/CMakeLists.txt 2022-03-21 11:40:19.595169803 +0100
@@ -63,11 +63,11 @@ endif ()
if (WIN32)
install(TARGETS
cgiowish
- RUNTIME DESTINATION bin)
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR})
install(PROGRAMS
cgnsview.bat
cgnsnodes.bat
- DESTINATION bin)
+ DESTINATION ${BIN_INSTALL_DIR})
install(FILES
cgnsview.tcl
cgns.tcl
@@ -79,21 +79,21 @@ if (WIN32)
else ()
install(TARGETS
cgiowish
- RUNTIME DESTINATION bin/cgnstools)
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR}/cgnstools)
install(PROGRAMS
cgnsview.sh
- DESTINATION bin
+ DESTINATION ${BIN_INSTALL_DIR}
RENAME cgnsview)
install(PROGRAMS
cgnsview.desktop
- DESTINATION bin)
+ DESTINATION ${BIN_INSTALL_DIR})
install(PROGRAMS
cgnsnodes.sh
- DESTINATION bin
+ DESTINATION ${BIN_INSTALL_DIR}
RENAME cgnsnodes)
install(PROGRAMS
cgnsnodes.desktop
- DESTINATION bin)
+ DESTINATION ${BIN_INSTALL_DIR})
install(FILES
cgnsview.tcl
cgns.tcl
diff -rupN CGNS-4.3.0/src/cgnstools/CMakeLists.txt CGNS-4.3.0-new/src/cgnstools/CMakeLists.txt
--- CGNS-4.3.0/src/cgnstools/CMakeLists.txt 2022-03-21 13:43:17.863321872 +0100
+++ CGNS-4.3.0-new/src/cgnstools/CMakeLists.txt 2022-03-21 11:40:19.596169823 +0100
@@ -111,7 +111,7 @@ set CG_LIB_DIR=${WIN_INSTALL_DIR}\\share
install(PROGRAMS
${CMAKE_CURRENT_BINARY_DIR}/cgconfig.bat
- DESTINATION bin)
+ DESTINATION ${BIN_INSTALL_DIR})
else ()
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/cgconfig
"CG_BIN_DIR=${CMAKE_INSTALL_PREFIX}/bin; export CG_BIN_DIR
@@ -120,6 +120,6 @@ CG_LIB_DIR=${CMAKE_INSTALL_PREFIX}/share
install(PROGRAMS
${CMAKE_CURRENT_BINARY_DIR}/cgconfig
- DESTINATION bin)
+ DESTINATION ${BIN_INSTALL_DIR})
endif ()
diff -rupN CGNS-4.3.0/src/cgnstools/utilities/CMakeLists.txt CGNS-4.3.0-new/src/cgnstools/utilities/CMakeLists.txt
--- CGNS-4.3.0/src/cgnstools/utilities/CMakeLists.txt 2022-03-21 13:43:17.863321872 +0100
+++ CGNS-4.3.0-new/src/cgnstools/utilities/CMakeLists.txt 2022-03-21 11:40:19.596169823 +0100
@@ -243,7 +243,7 @@ if (WIN32)
interpolate_cgns
update_ngon
cgns_info
- RUNTIME DESTINATION bin)
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR})
install(FILES
conserved.cnv
convert.tcl
@@ -281,7 +281,7 @@ else ()
interpolate_cgns
update_ngon
cgns_info
- RUNTIME DESTINATION bin/cgnstools)
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR}/cgnstools)
install(FILES
conserved.cnv
convert.tcl
diff -rupN CGNS-4.3.0/src/CMakeLists.txt CGNS-4.3.0-new/src/CMakeLists.txt
--- CGNS-4.3.0/src/CMakeLists.txt 2022-03-21 13:43:17.864321867 +0100
+++ CGNS-4.3.0-new/src/CMakeLists.txt 2022-03-21 13:44:28.804031877 +0100
@@ -45,7 +45,7 @@ set(SYSCFLAGS "")
set(CFGFLAGS "")
set(LIBS "")
-file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/lib LIBDIR)
+file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} LIBDIR)
file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/include INCLUDEDIR)
file(TO_NATIVE_PATH ${CMAKE_C_COMPILER} CC)
if (WIN32)
@@ -682,10 +682,10 @@ endif ()
# for windows, need to install both cgnsdll.dll and cgnsdll.lib
install (TARGETS ${install_targets}
EXPORT cgns-targets
- LIBRARY DESTINATION lib COMPONENT libraries
- ARCHIVE DESTINATION lib COMPONENT libraries
- RUNTIME DESTINATION bin COMPONENT libraries
- INCLUDES DESTINATION include)
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT libraries
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT libraries
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT libraries
+ INCLUDES DESTINATION ${INCLUDE_INSTALL_DIR})
# Set the install path of the header files
set(headers
@@ -724,13 +724,13 @@ endif ()
# Set the install path of the header files
install(FILES ${headers}
- DESTINATION include)
+ DESTINATION ${INCLUDE_INSTALL_DIR})
#if (NOT CGNS_EXTERNALLY_CONFIGURE)
install(EXPORT cgns-targets
FILE cgns-targets.cmake
NAMESPACE CGNS::
- DESTINATION lib/cmake/cgns
+ DESTINATION ${LIB_INSTALL_DIR}/cmake/cgns
)
#endif()
diff -rupN CGNS-4.3.0/src/tools/CMakeLists.txt CGNS-4.3.0-new/src/tools/CMakeLists.txt
--- CGNS-4.3.0/src/tools/CMakeLists.txt 2022-03-21 13:43:17.865321861 +0100
+++ CGNS-4.3.0-new/src/tools/CMakeLists.txt 2022-03-21 11:40:19.596169823 +0100
@@ -72,27 +72,27 @@ install(TARGETS
cgnslist
cgnsnames
cgnscompress
- RUNTIME DESTINATION bin)
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR})
if (WIN32)
install(PROGRAMS
cgnsupdate.bat
- DESTINATION bin)
+ DESTINATION ${BIN_INSTALL_DIR})
if (CGNS_ENABLE_HDF5)
install(PROGRAMS
adf2hdf.bat
hdf2adf.bat
- DESTINATION bin)
+ DESTINATION ${BIN_INSTALL_DIR})
endif ()
else ()
install(PROGRAMS
cgnsupdate
- DESTINATION bin)
+ DESTINATION ${BIN_INSTALL_DIR})
if (CGNS_ENABLE_HDF5)
install(PROGRAMS
adf2hdf
hdf2adf
- DESTINATION bin)
+ DESTINATION ${BIN_INSTALL_DIR})
endif ()
endif ()
|
