File djv-1.0.5_path.patch of Package djv (Revision 2fea5ef395b81a5013960df8f9862ee6)

Currently displaying revision 2fea5ef395b81a5013960df8f9862ee6 , Show latest

403
 
1
--- a/bin/djv_convert/CMakeLists.txt
2
+++ b/bin/djv_convert/CMakeLists.txt
3
@@ -54,16 +54,5 @@ install(
4
     TARGETS djv_convert
5
     RUNTIME DESTINATION bin)
6
7
-if (UNIX)
8
9
-    configure_file(
10
-        ${CMAKE_CURRENT_SOURCE_DIR}/djv_convert_linux.sh.in
11
-        ${CMAKE_CURRENT_BINARY_DIR}/djv_convert.sh
12
-        @ONLY)
13
-
14
-    install(
15
-        PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djv_convert.sh
16
-        DESTINATION bin)
17
-
18
-endif (UNIX)
19
20
--- a/bin/djv_info/CMakeLists.txt
21
+++ b/bin/djv_info/CMakeLists.txt
22
@@ -54,16 +54,5 @@ install(
23
     TARGETS djv_info
24
     RUNTIME DESTINATION bin)
25
26
-if (UNIX)
27
28
-    configure_file(
29
-        ${CMAKE_CURRENT_SOURCE_DIR}/djv_info_linux.sh.in
30
-        ${CMAKE_CURRENT_BINARY_DIR}/djv_info.sh
31
-        @ONLY)
32
-
33
-    install(
34
-        PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djv_info.sh
35
-        DESTINATION bin)
36
-
37
-endif (UNIX)
38
39
--- a/bin/djv_ls/CMakeLists.txt
40
+++ b/bin/djv_ls/CMakeLists.txt
41
@@ -54,16 +54,4 @@ install(
42
     TARGETS djv_ls
43
     RUNTIME DESTINATION bin)
44
45
-if (UNIX)
46
-
47
-    configure_file(
48
-        ${CMAKE_CURRENT_SOURCE_DIR}/djv_ls_linux.sh.in
49
-        ${CMAKE_CURRENT_BINARY_DIR}/djv_ls.sh
50
-        @ONLY)
51
-
52
-    install(
53
-        PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djv_ls.sh
54
-        DESTINATION bin)
55
-
56
-endif (UNIX)
57
58
--- a/bin/djv_view/CMakeLists.txt
59
+++ b/bin/djv_view/CMakeLists.txt
60
@@ -72,15 +72,6 @@ if (APPLE)
61
62
 elseif (UNIX)
63
64
-    configure_file(
65
-        ${CMAKE_CURRENT_SOURCE_DIR}/djv_view_linux.sh.in
66
-        ${CMAKE_CURRENT_BINARY_DIR}/djv_view.sh
67
-        @ONLY)
68
-
69
-    install(
70
-        PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djv_view.sh
71
-        DESTINATION bin)
72
-
73
     install(
74
         FILES ${PROJECT_BINARY_DIR}/etc/Linux/djv_view.desktop
75
         DESTINATION /usr/share/applications)
76
--- a/doc/CMakeLists.txt
77
+++ b/doc/CMakeLists.txt
78
@@ -102,12 +102,12 @@ set(legal
79
 install(
80
     FILES
81
     ${html}
82
-    DESTINATION doc)
83
+    DESTINATION ${SHARE_INSTALL_PREFIX}/djv/doc)
84
85
 install(
86
     FILES
87
     ${images}
88
-    DESTINATION doc/images)
89
+    DESTINATION ${SHARE_INSTALL_PREFIX}/djv/doc/images)
90
91
 #install(
92
 #    DIRECTORY
93
@@ -117,4 +117,4 @@ install(
94
 install(
95
     FILES
96
     ${legal}
97
-    DESTINATION doc)
98
+    DESTINATION ${SHARE_INSTALL_PREFIX}/djv/doc)
99
--- a/lib/djvCore/CMakeLists.txt
100
+++ b/lib/djvCore/CMakeLists.txt
101
@@ -169,7 +169,7 @@ add_library(djvCore ${header} ${source}
102
103
 target_link_libraries(djvCore ${djvCoreDeps})
104
105
-set_target_properties(djvCore PROPERTIES FOLDER lib)
106
+set_target_properties(djvCore PROPERTIES VERSION 0.0.0 SOVERSION 0)
107
108
 if (djvInstallRpath)
109
110
@@ -190,6 +190,6 @@ install(
111
 install(
112
     TARGETS djvCore
113
     RUNTIME DESTINATION bin
114
-    LIBRARY DESTINATION lib
115
-    ARCHIVE DESTINATION lib)
116
+    LIBRARY DESTINATION lib${LIB_SUFFIX}
117
+    ARCHIVE DESTINATION lib${LIB_SUFFIX})
118
119
--- a/lib/djvGui/CMakeLists.txt
120
+++ b/lib/djvGui/CMakeLists.txt
121
@@ -229,7 +229,7 @@ add_library(djvGui ${header} ${source} $
122
123
 target_link_libraries(djvGui ${djvGuiDeps})
124
125
-set_target_properties(djvGui PROPERTIES FOLDER lib)
126
+set_target_properties(djvGui PROPERTIES VERSION 0.0.0 SOVERSION 0)
127
128
 if (djvInstallRpath)
129
130
@@ -250,6 +250,6 @@ install(
131
 install(
132
     TARGETS djvGui
133
     RUNTIME DESTINATION bin
134
-    LIBRARY DESTINATION lib
135
-    ARCHIVE DESTINATION lib)
136
+    LIBRARY DESTINATION lib${LIB_SUFFIX}
137
+    ARCHIVE DESTINATION lib${LIB_SUFFIX})
138
139
--- a/lib/djvViewLib/CMakeLists.txt
140
+++ b/lib/djvViewLib/CMakeLists.txt
141
@@ -212,7 +212,7 @@ add_library(djvViewLib ${header} ${sourc
142
143
 target_link_libraries(djvViewLib ${djvGuiLibs})
144
145
-set_target_properties(djvViewLib PROPERTIES FOLDER lib)
146
+set_target_properties(djvViewLib PROPERTIES VERSION 0.0.0 SOVERSION 0)
147
148
 if (djvInstallRpath)
149
150
@@ -233,6 +233,6 @@ install(
151
 install(
152
     TARGETS djvViewLib
153
     RUNTIME DESTINATION bin
154
-    LIBRARY DESTINATION lib
155
-    ARCHIVE DESTINATION lib)
156
+    LIBRARY DESTINATION lib${LIB_SUFFIX}
157
+    ARCHIVE DESTINATION lib${LIB_SUFFIX})
158
159
--- a/plugins/djvCineonPlugin/CMakeLists.txt
160
+++ b/plugins/djvCineonPlugin/CMakeLists.txt
161
@@ -63,10 +63,10 @@ install(
162
 install(
163
     TARGETS djvCineonPlugin
164
     RUNTIME DESTINATION bin
165
-    LIBRARY DESTINATION lib
166
-    ARCHIVE DESTINATION lib)
167
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
168
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
169
 install(
170
     TARGETS djvCineonWidgetPlugin
171
     RUNTIME DESTINATION bin
172
-    LIBRARY DESTINATION lib
173
-    ARCHIVE DESTINATION lib)
174
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
175
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
176
--- a/plugins/djvDpxPlugin/CMakeLists.txt
177
+++ b/plugins/djvDpxPlugin/CMakeLists.txt
178
@@ -67,10 +67,10 @@ install(
179
 install(
180
     TARGETS djvDpxPlugin
181
     RUNTIME DESTINATION bin
182
-    LIBRARY DESTINATION lib
183
-    ARCHIVE DESTINATION lib)
184
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
185
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
186
 install(
187
     TARGETS djvDpxWidgetPlugin
188
     RUNTIME DESTINATION bin
189
-    LIBRARY DESTINATION lib
190
-    ARCHIVE DESTINATION lib)
191
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
192
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
193
--- a/plugins/djvIffPlugin/CMakeLists.txt
194
+++ b/plugins/djvIffPlugin/CMakeLists.txt
195
@@ -61,10 +61,10 @@ install(
196
 install(
197
     TARGETS djvIffPlugin
198
     RUNTIME DESTINATION bin
199
-    LIBRARY DESTINATION lib
200
-    ARCHIVE DESTINATION lib)
201
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
202
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
203
 install(
204
     TARGETS djvIffWidgetPlugin
205
     RUNTIME DESTINATION bin
206
-    LIBRARY DESTINATION lib
207
-    ARCHIVE DESTINATION lib)
208
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
209
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
210
--- a/plugins/djvIflPlugin/CMakeLists.txt
211
+++ b/plugins/djvIflPlugin/CMakeLists.txt
212
@@ -29,5 +29,5 @@ endif (djvInstallRpath)
213
 install(
214
     TARGETS djvIflPlugin
215
     RUNTIME DESTINATION bin
216
-    LIBRARY DESTINATION lib
217
-    ARCHIVE DESTINATION lib)
218
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
219
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
220
--- a/plugins/djvJpegPlugin/CMakeLists.txt
221
+++ b/plugins/djvJpegPlugin/CMakeLists.txt
222
@@ -62,11 +62,11 @@ install(
223
 install(
224
     TARGETS djvJpegPlugin
225
     RUNTIME DESTINATION bin
226
-    LIBRARY DESTINATION lib
227
-    ARCHIVE DESTINATION lib)
228
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
229
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
230
 install(
231
     TARGETS djvJpegWidgetPlugin
232
     RUNTIME DESTINATION bin
233
-    LIBRARY DESTINATION lib
234
-    ARCHIVE DESTINATION lib)
235
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
236
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
237
238
--- a/plugins/djvLutPlugin/CMakeLists.txt
239
+++ b/plugins/djvLutPlugin/CMakeLists.txt
240
@@ -61,10 +61,10 @@ install(
241
 install(
242
     TARGETS djvLutPlugin
243
     RUNTIME DESTINATION bin
244
-    LIBRARY DESTINATION lib
245
-    ARCHIVE DESTINATION lib)
246
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
247
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
248
 install(
249
     TARGETS djvLutWidgetPlugin
250
     RUNTIME DESTINATION bin
251
-    LIBRARY DESTINATION lib
252
-    ARCHIVE DESTINATION lib)
253
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
254
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
255
--- a/plugins/djvOpenExrPlugin/CMakeLists.txt
256
+++ b/plugins/djvOpenExrPlugin/CMakeLists.txt
257
@@ -63,10 +63,10 @@ install(
258
 install(
259
     TARGETS djvOpenExrPlugin
260
     RUNTIME DESTINATION bin
261
-    LIBRARY DESTINATION lib
262
-    ARCHIVE DESTINATION lib)
263
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
264
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
265
 install(
266
     TARGETS djvOpenExrWidgetPlugin
267
     RUNTIME DESTINATION bin
268
-    LIBRARY DESTINATION lib
269
-    ARCHIVE DESTINATION lib)
270
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
271
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
272
--- a/plugins/djvPicPlugin/CMakeLists.txt
273
+++ b/plugins/djvPicPlugin/CMakeLists.txt
274
@@ -40,5 +40,5 @@ install(
275
 install(
276
     TARGETS djvPicPlugin
277
     RUNTIME DESTINATION bin
278
-    LIBRARY DESTINATION lib
279
-    ARCHIVE DESTINATION lib)
280
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
281
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
282
--- a/plugins/djvPngPlugin/CMakeLists.txt
283
+++ b/plugins/djvPngPlugin/CMakeLists.txt
284
@@ -37,5 +37,5 @@ endif (djvInstallRpath)
285
 install(
286
     TARGETS djvPngPlugin
287
     RUNTIME DESTINATION bin
288
-    LIBRARY DESTINATION lib
289
-    ARCHIVE DESTINATION lib)
290
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
291
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
292
--- a/plugins/djvPpmPlugin/CMakeLists.txt
293
+++ b/plugins/djvPpmPlugin/CMakeLists.txt
294
@@ -61,10 +61,10 @@ install(
295
 install(
296
     TARGETS djvPpmPlugin
297
     RUNTIME DESTINATION bin
298
-    LIBRARY DESTINATION lib
299
-    ARCHIVE DESTINATION lib)
300
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
301
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
302
 install(
303
     TARGETS djvPpmWidgetPlugin
304
     RUNTIME DESTINATION bin
305
-    LIBRARY DESTINATION lib
306
-    ARCHIVE DESTINATION lib)
307
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
308
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
309
--- a/plugins/djvRlaPlugin/CMakeLists.txt
310
+++ b/plugins/djvRlaPlugin/CMakeLists.txt
311
@@ -29,5 +29,5 @@ endif (djvInstallRpath)
312
 install(
313
     TARGETS djvRlaPlugin
314
     RUNTIME DESTINATION bin
315
-    LIBRARY DESTINATION lib
316
-    ARCHIVE DESTINATION lib)
317
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
318
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
319
--- a/plugins/djvSgiPlugin/CMakeLists.txt
320
+++ b/plugins/djvSgiPlugin/CMakeLists.txt
321
@@ -61,10 +61,10 @@ install(
322
 install(
323
     TARGETS djvSgiPlugin
324
     RUNTIME DESTINATION bin
325
-    LIBRARY DESTINATION lib
326
-    ARCHIVE DESTINATION lib)
327
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
328
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
329
 install(
330
     TARGETS djvSgiWidgetPlugin
331
     RUNTIME DESTINATION bin
332
-    LIBRARY DESTINATION lib
333
-    ARCHIVE DESTINATION lib)
334
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
335
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
336
--- a/plugins/djvTargaPlugin/CMakeLists.txt
337
+++ b/plugins/djvTargaPlugin/CMakeLists.txt
338
@@ -61,10 +61,10 @@ install(
339
 install(
340
     TARGETS djvTargaPlugin
341
     RUNTIME DESTINATION bin
342
-    LIBRARY DESTINATION lib
343
-    ARCHIVE DESTINATION lib)
344
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
345
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
346
 install(
347
     TARGETS djvTargaWidgetPlugin
348
     RUNTIME DESTINATION bin
349
-    LIBRARY DESTINATION lib
350
-    ARCHIVE DESTINATION lib)
351
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
352
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
353
--- a/plugins/djvTiffPlugin/CMakeLists.txt
354
+++ b/plugins/djvTiffPlugin/CMakeLists.txt
355
@@ -74,10 +74,10 @@ install(
356
 install(
357
     TARGETS djvTiffPlugin
358
     RUNTIME DESTINATION bin
359
-    LIBRARY DESTINATION lib
360
-    ARCHIVE DESTINATION lib)
361
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
362
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
363
 install(
364
     TARGETS djvTiffWidgetPlugin
365
     RUNTIME DESTINATION bin
366
-    LIBRARY DESTINATION lib
367
-    ARCHIVE DESTINATION lib)
368
+    LIBRARY DESTINATION lib${LIB_SUFFIX}/djv
369
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
370
--- a/tests/djvTestLib/CMakeLists.txt
371
+++ b/tests/djvTestLib/CMakeLists.txt
372
@@ -32,13 +32,3 @@ if (djvInstallRpath)
373
374
 endif (djvInstallRpath)
375
376
-install(
377
-    FILES ${header}
378
-    DESTINATION include)
379
-
380
-install(
381
-    TARGETS djvTestLib
382
-    RUNTIME DESTINATION bin
383
-    LIBRARY DESTINATION lib
384
-    ARCHIVE DESTINATION lib)
385
-
386
--- a/plugins/djvFFmpegPlugin/CMakeLists.txt
387
+++ b/plugins/djvFFmpegPlugin/CMakeLists.txt
388
@@ -62,10 +62,10 @@ install(
389
 install(
390
     TARGETS djvFFmpegPlugin
391
     RUNTIME DESTINATION bin
392
-    LIBRARY DESTINATION lib
393
-    ARCHIVE DESTINATION lib)
394
+    LIBRARY DESTINATION li${LIB_SUFFIX}/djvb
395
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
396
 install(
397
     TARGETS djvFFmpegWidgetPlugin
398
     RUNTIME DESTINATION bin
399
-    LIBRARY DESTINATION lib
400
-    ARCHIVE DESTINATION lib)
401
+    LIBRARY DESTINATION li${LIB_SUFFIX}/djvb
402
+    ARCHIVE DESTINATION lib${LIB_SUFFIX}/djv)
403
​
Locations
Help
Contact