1 |
commit: ef58e4bf1e89bb88381263c85ea4f55d9aae7efc |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Aug 21 18:24:49 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 12 10:18:27 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef58e4bf |
7 |
|
8 |
media-libs/openjpeg: remove unused patches |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/12761 |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
.../openjpeg-2.3.0-fix-disable-static-libs.patch | 23 - |
15 |
.../files/openjpeg-2.3.0-gnuinstalldirs.patch | 501 --------------------- |
16 |
2 files changed, 524 deletions(-) |
17 |
|
18 |
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch b/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch |
19 |
deleted file mode 100644 |
20 |
index 9e30f4694f3..00000000000 |
21 |
--- a/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch |
22 |
+++ /dev/null |
23 |
@@ -1,23 +0,0 @@ |
24 |
-From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001 |
25 |
-From: Even Rouault <even.rouault@×××××××××.com> |
26 |
-Date: Mon, 9 Oct 2017 11:40:43 +0200 |
27 |
-Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or |
28 |
- static-only build lacks the installation target for the library (#1019, fixes |
29 |
- regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b) |
30 |
- |
31 |
---- |
32 |
- src/lib/openjp2/CMakeLists.txt | 1 + |
33 |
- 1 file changed, 1 insertion(+) |
34 |
- |
35 |
-diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt |
36 |
-index 0b4520384..f8990ccf0 100644 |
37 |
---- a/src/lib/openjp2/CMakeLists.txt |
38 |
-+++ b/src/lib/openjp2/CMakeLists.txt |
39 |
-@@ -99,6 +99,7 @@ else() |
40 |
- set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static) |
41 |
- else() |
42 |
- add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) |
43 |
-+ set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME}) |
44 |
- endif() |
45 |
- endif() |
46 |
- |
47 |
|
48 |
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch |
49 |
deleted file mode 100644 |
50 |
index 41942e45155..00000000000 |
51 |
--- a/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch |
52 |
+++ /dev/null |
53 |
@@ -1,501 +0,0 @@ |
54 |
-From: Andreas Sturmlechner <asturm@××××××.com> |
55 |
-Date: Fri, 2 Nov 2018 17:23:49 +0100 |
56 |
-Subject: Use GNUInstallDirs for standard installation directories |
57 |
- |
58 |
-Raises minimum cmake version by a little. |
59 |
- |
60 |
- |
61 |
-commit 24fd3ce777a64b8b315cfe1ee642ec7b1cc6aa97 |
62 |
-Author: Libor Bukata <libor.bukata@××××××.com> |
63 |
-Date: Fri Aug 31 12:57:40 2018 +0200 |
64 |
- |
65 |
- The change makes a relative path to header files |
66 |
- always correct regardless of the number of sub- |
67 |
- directories in OPENJPEG_INSTALL_PACKAGE_DIR variable. |
68 |
- |
69 |
-diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in |
70 |
-index b20294ca..2925108a 100644 |
71 |
---- a/cmake/OpenJPEGConfig.cmake.in |
72 |
-+++ b/cmake/OpenJPEGConfig.cmake.in |
73 |
-@@ -26,8 +26,13 @@ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) |
74 |
- if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) |
75 |
- # This is an install tree |
76 |
- include(${SELF_DIR}/OpenJPEGTargets.cmake) |
77 |
-- get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) |
78 |
-- set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT}) |
79 |
-+ |
80 |
-+ # We find a relative path from the PKG directory to header files. |
81 |
-+ set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@") |
82 |
-+ set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@") |
83 |
-+ file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}") |
84 |
-+ |
85 |
-+ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE) |
86 |
- |
87 |
- else() |
88 |
- if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake) |
89 |
- |
90 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
91 |
-index cb545666..2ff3b00a 100644 |
92 |
---- a/CMakeLists.txt |
93 |
-+++ b/CMakeLists.txt |
94 |
-@@ -7,7 +7,7 @@ |
95 |
- # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like |
96 |
- # e.g.: |
97 |
- # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG") |
98 |
--cmake_minimum_required(VERSION 2.8.2) |
99 |
-+cmake_minimum_required(VERSION 2.8.5) |
100 |
- |
101 |
- if(COMMAND CMAKE_POLICY) |
102 |
- cmake_policy(SET CMP0003 NEW) |
103 |
-@@ -102,59 +102,28 @@ endif() |
104 |
- |
105 |
- # -------------------------------------------------------------------------- |
106 |
- # Install directories |
107 |
-+include(GNUInstallDirs) |
108 |
-+ |
109 |
- # Build DOCUMENTATION (not in ALL target and only if Doxygen is found) |
110 |
- option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF) |
111 |
- |
112 |
- string(TOLOWER ${PROJECT_NAME} projectname) |
113 |
- set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}") |
114 |
- |
115 |
--if(NOT OPENJPEG_INSTALL_BIN_DIR) |
116 |
-- set(OPENJPEG_INSTALL_BIN_DIR "bin") |
117 |
--endif() |
118 |
-- |
119 |
--if(NOT OPENJPEG_INSTALL_LIB_DIR) |
120 |
-- set(OPENJPEG_INSTALL_LIB_DIR "lib") |
121 |
--endif() |
122 |
-- |
123 |
--if(NOT OPENJPEG_INSTALL_SHARE_DIR) |
124 |
-- set(OPENJPEG_INSTALL_SHARE_DIR "share") |
125 |
--endif() |
126 |
-- |
127 |
--if(NOT OPENJPEG_INSTALL_DATA_DIR) |
128 |
-- set(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}") |
129 |
--endif() |
130 |
-- |
131 |
--if(NOT OPENJPEG_INSTALL_INCLUDE_DIR) |
132 |
-- set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}") |
133 |
--endif() |
134 |
-- |
135 |
--if(BUILD_DOC) |
136 |
--if(NOT OPENJPEG_INSTALL_MAN_DIR) |
137 |
-- set(OPENJPEG_INSTALL_MAN_DIR "share/man/") |
138 |
--endif() |
139 |
-- |
140 |
--if(NOT OPENJPEG_INSTALL_DOC_DIR) |
141 |
-- set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}") |
142 |
--endif() |
143 |
--endif() |
144 |
-- |
145 |
- if(NOT OPENJPEG_INSTALL_JNI_DIR) |
146 |
- if(WIN32) |
147 |
-- set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR}) |
148 |
-+ set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR}) |
149 |
- else() |
150 |
-- set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR}) |
151 |
-+ set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR}) |
152 |
- endif() |
153 |
- endif() |
154 |
- |
155 |
- if(NOT OPENJPEG_INSTALL_PACKAGE_DIR) |
156 |
-- # We could install *.cmake files in share/ however those files contains |
157 |
-- # hardcoded path to libraries on a multi-arch system (fedora/debian) those |
158 |
-- # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu) |
159 |
-- set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") |
160 |
-+ set(OPENJPEG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}") |
161 |
- endif() |
162 |
- |
163 |
- if (APPLE) |
164 |
-- list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}") |
165 |
-+ list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") |
166 |
- option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF) |
167 |
- endif() |
168 |
- |
169 |
-@@ -338,14 +307,6 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake |
170 |
- ) |
171 |
- |
172 |
- #----------------------------------------------------------------------------- |
173 |
--# install CHANGES and LICENSE |
174 |
--if(BUILD_DOC) |
175 |
--if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES) |
176 |
-- install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) |
177 |
--endif() |
178 |
-- |
179 |
--install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) |
180 |
--endif() |
181 |
- |
182 |
- include (cmake/OpenJPEGCPack.cmake) |
183 |
- |
184 |
-@@ -362,14 +323,14 @@ if(BUILD_PKGCONFIG_FILES) |
185 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in |
186 |
- ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY) |
187 |
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION |
188 |
-- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) |
189 |
-+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) |
190 |
- # |
191 |
- if(BUILD_JPWL) |
192 |
- # install in lib and not share (see multi-arch note above) |
193 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in |
194 |
- ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY) |
195 |
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION |
196 |
-- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) |
197 |
-+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) |
198 |
- endif() |
199 |
- # |
200 |
- if(BUILD_JPIP) |
201 |
-@@ -377,7 +338,7 @@ if(BUILD_PKGCONFIG_FILES) |
202 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in |
203 |
- ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY) |
204 |
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION |
205 |
-- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) |
206 |
-+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) |
207 |
- endif() |
208 |
- # |
209 |
- if(BUILD_JP3D) |
210 |
-@@ -385,7 +346,7 @@ if(BUILD_PKGCONFIG_FILES) |
211 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in |
212 |
- ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY) |
213 |
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION |
214 |
-- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) |
215 |
-+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) |
216 |
- endif() |
217 |
- endif() |
218 |
- |
219 |
-diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in |
220 |
-index 2925108a..702e2790 100644 |
221 |
---- a/cmake/OpenJPEGConfig.cmake.in |
222 |
-+++ b/cmake/OpenJPEGConfig.cmake.in |
223 |
-@@ -29,7 +29,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) |
224 |
- |
225 |
- # We find a relative path from the PKG directory to header files. |
226 |
- set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@") |
227 |
-- set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@") |
228 |
-+ set(INC_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@") |
229 |
- file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}") |
230 |
- |
231 |
- get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE) |
232 |
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt |
233 |
-index d4f3ddbe..ed5cb44c 100644 |
234 |
---- a/doc/CMakeLists.txt |
235 |
-+++ b/doc/CMakeLists.txt |
236 |
-@@ -44,7 +44,7 @@ if(DOXYGEN_FOUND) |
237 |
- |
238 |
- # install HTML documentation (install png files too): |
239 |
- install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html |
240 |
-- DESTINATION share/doc |
241 |
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR} |
242 |
- PATTERN ".svn" EXCLUDE |
243 |
- ) |
244 |
- else() |
245 |
-diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt |
246 |
-index 4d4bd952..29b4dd20 100644 |
247 |
---- a/src/bin/jp2/CMakeLists.txt |
248 |
-+++ b/src/bin/jp2/CMakeLists.txt |
249 |
-@@ -67,7 +67,7 @@ foreach(exe opj_decompress opj_compress opj_dump) |
250 |
- # Install exe |
251 |
- install(TARGETS ${exe} |
252 |
- EXPORT OpenJPEGTargets |
253 |
-- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
254 |
-+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
255 |
- ) |
256 |
- if(OPJ_USE_DSYMUTIL) |
257 |
- add_custom_command(TARGET ${exe} POST_BUILD |
258 |
-@@ -83,6 +83,6 @@ install( |
259 |
- FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1 |
260 |
- ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_decompress.1 |
261 |
- ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1 |
262 |
-- DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1) |
263 |
-+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) |
264 |
- # |
265 |
- endif() |
266 |
-diff --git a/src/bin/jp3d/CMakeLists.txt b/src/bin/jp3d/CMakeLists.txt |
267 |
-index 3cac1a8f..ed62b4f3 100644 |
268 |
---- a/src/bin/jp3d/CMakeLists.txt |
269 |
-+++ b/src/bin/jp3d/CMakeLists.txt |
270 |
-@@ -36,6 +36,6 @@ foreach(exe opj_jp3d_compress opj_jp3d_decompress) |
271 |
- # Install exe |
272 |
- install(TARGETS ${exe} |
273 |
- EXPORT OpenJP3DTargets |
274 |
-- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
275 |
-+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
276 |
- ) |
277 |
- endforeach() |
278 |
-diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt |
279 |
-index 301d885b..ddd867dc 100644 |
280 |
---- a/src/bin/jpip/CMakeLists.txt |
281 |
-+++ b/src/bin/jpip/CMakeLists.txt |
282 |
-@@ -13,7 +13,7 @@ add_executable(opj_jpip_addxml opj_jpip_addxml.c) |
283 |
- # Install exe |
284 |
- install(TARGETS opj_jpip_addxml |
285 |
- EXPORT OpenJPEGTargets |
286 |
-- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
287 |
-+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
288 |
- ) |
289 |
- |
290 |
- if(BUILD_JPIP_SERVER) |
291 |
-@@ -38,7 +38,7 @@ if(BUILD_JPIP_SERVER) |
292 |
- # Install exe |
293 |
- install(TARGETS opj_server |
294 |
- EXPORT OpenJPEGTargets |
295 |
-- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
296 |
-+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
297 |
- ) |
298 |
- endif() |
299 |
- |
300 |
-@@ -52,7 +52,7 @@ add_executable(${exe} ${exe}.c) |
301 |
- target_link_libraries(${exe} openjpip) |
302 |
- install(TARGETS ${exe} |
303 |
- EXPORT OpenJPEGTargets |
304 |
-- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
305 |
-+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
306 |
- ) |
307 |
- endforeach() |
308 |
- |
309 |
-@@ -123,7 +123,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE) |
310 |
- ) |
311 |
- |
312 |
- install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar |
313 |
-- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule |
314 |
-+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule |
315 |
- ) |
316 |
- else() |
317 |
- # opj_viewer (simple, no xerces) |
318 |
-@@ -153,7 +153,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE) |
319 |
- ) |
320 |
- |
321 |
- install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar |
322 |
-- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule |
323 |
-+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule |
324 |
- ) |
325 |
- endif() |
326 |
- else() |
327 |
-diff --git a/src/bin/jpwl/CMakeLists.txt b/src/bin/jpwl/CMakeLists.txt |
328 |
-index 5df225de..8a798e61 100644 |
329 |
---- a/src/bin/jpwl/CMakeLists.txt |
330 |
-+++ b/src/bin/jpwl/CMakeLists.txt |
331 |
-@@ -57,6 +57,6 @@ foreach(exe decompress compress) |
332 |
- endif() |
333 |
- |
334 |
- install(TARGETS ${jpwl_exe} |
335 |
-- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
336 |
-+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
337 |
- ) |
338 |
- endforeach() |
339 |
-diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt |
340 |
-index 5d3e288b..6669c502 100644 |
341 |
---- a/src/bin/mj2/CMakeLists.txt |
342 |
-+++ b/src/bin/mj2/CMakeLists.txt |
343 |
-@@ -43,5 +43,5 @@ foreach(exe |
344 |
- endif() |
345 |
- |
346 |
- install(TARGETS ${exe} |
347 |
-- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR}) |
348 |
-+ DESTINATION ${CMAKE_INSTALL_BINDIR}) |
349 |
- endforeach() |
350 |
-diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt |
351 |
-index b2714858..9cbc4c3f 100644 |
352 |
---- a/src/lib/openjp2/CMakeLists.txt |
353 |
-+++ b/src/lib/openjp2/CMakeLists.txt |
354 |
-@@ -2,7 +2,7 @@ include_regular_expression("^.*$") |
355 |
- |
356 |
- # |
357 |
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h |
358 |
-- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers) |
359 |
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers) |
360 |
- |
361 |
- include_directories( |
362 |
- ${${OPENJPEG_NAMESPACE}_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h |
363 |
-@@ -114,21 +114,21 @@ endif() |
364 |
- # Install library |
365 |
- install(TARGETS ${INSTALL_LIBS} |
366 |
- EXPORT OpenJPEGTargets |
367 |
-- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
368 |
-- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
369 |
-- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
370 |
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
371 |
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
372 |
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
373 |
- ) |
374 |
- |
375 |
- # Install includes files |
376 |
- install(FILES openjpeg.h opj_stdint.h |
377 |
-- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers |
378 |
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers |
379 |
- ) |
380 |
- |
381 |
- if(BUILD_DOC) |
382 |
- # install man page of the library |
383 |
- install( |
384 |
- FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjp2.3 |
385 |
-- DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3) |
386 |
-+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man3) |
387 |
- endif() |
388 |
- |
389 |
- if(BUILD_LUTS_GENERATOR) |
390 |
-diff --git a/src/lib/openjp2/libopenjp2.pc.cmake.in b/src/lib/openjp2/libopenjp2.pc.cmake.in |
391 |
-index 62159b00..ebad9578 100644 |
392 |
---- a/src/lib/openjp2/libopenjp2.pc.cmake.in |
393 |
-+++ b/src/lib/openjp2/libopenjp2.pc.cmake.in |
394 |
-@@ -1,9 +1,9 @@ |
395 |
- prefix=@CMAKE_INSTALL_PREFIX@ |
396 |
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ |
397 |
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ |
398 |
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ |
399 |
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ |
400 |
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ |
401 |
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ |
402 |
-+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ |
403 |
-+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ |
404 |
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
405 |
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ |
406 |
- |
407 |
- Name: openjp2 |
408 |
- Description: JPEG2000 library (Part 1 and 2) |
409 |
-diff --git a/src/lib/openjp3d/CMakeLists.txt b/src/lib/openjp3d/CMakeLists.txt |
410 |
-index b0469af1..6e251984 100644 |
411 |
---- a/src/lib/openjp3d/CMakeLists.txt |
412 |
-+++ b/src/lib/openjp3d/CMakeLists.txt |
413 |
-@@ -34,12 +34,12 @@ endif() |
414 |
- # Install library |
415 |
- install(TARGETS ${OPENJP3D_LIBRARY_NAME} |
416 |
- EXPORT OpenJP3DTargets |
417 |
-- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} |
418 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR} |
419 |
- COMPONENT Libraries |
420 |
- ) |
421 |
- |
422 |
- # Install includes files |
423 |
- install(FILES openjp3d.h |
424 |
-- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} |
425 |
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} |
426 |
- COMPONENT Headers |
427 |
- ) |
428 |
-diff --git a/src/lib/openjp3d/libopenjp3d.pc.cmake.in b/src/lib/openjp3d/libopenjp3d.pc.cmake.in |
429 |
-index e9b6c404..866a0174 100644 |
430 |
---- a/src/lib/openjp3d/libopenjp3d.pc.cmake.in |
431 |
-+++ b/src/lib/openjp3d/libopenjp3d.pc.cmake.in |
432 |
-@@ -1,9 +1,9 @@ |
433 |
- prefix=@CMAKE_INSTALL_PREFIX@ |
434 |
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ |
435 |
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ |
436 |
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ |
437 |
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ |
438 |
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ |
439 |
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ |
440 |
-+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ |
441 |
-+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ |
442 |
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
443 |
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ |
444 |
- |
445 |
- Name: openjp3d |
446 |
- Description: JPEG2000 Extensions for three-dimensional data (Part 10) |
447 |
-diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt |
448 |
-index b3cb8ce8..aace36d4 100644 |
449 |
---- a/src/lib/openjpip/CMakeLists.txt |
450 |
-+++ b/src/lib/openjpip/CMakeLists.txt |
451 |
-@@ -74,9 +74,9 @@ endif() |
452 |
- # Install library |
453 |
- install(TARGETS openjpip |
454 |
- EXPORT OpenJPEGTargets |
455 |
-- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
456 |
-- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
457 |
-- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
458 |
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
459 |
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
460 |
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
461 |
- ) |
462 |
- |
463 |
- if(BUILD_JPIP_SERVER) |
464 |
-@@ -86,6 +86,6 @@ if(BUILD_JPIP_SERVER) |
465 |
- PROPERTIES COMPILE_FLAGS "-DSERVER") |
466 |
- install(TARGETS openjpip_server |
467 |
- EXPORT OpenJPEGTargets |
468 |
-- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
469 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
470 |
- ) |
471 |
- endif() |
472 |
-diff --git a/src/lib/openjpip/libopenjpip.pc.cmake.in b/src/lib/openjpip/libopenjpip.pc.cmake.in |
473 |
-index 7c3f29af..4cfa6fce 100644 |
474 |
---- a/src/lib/openjpip/libopenjpip.pc.cmake.in |
475 |
-+++ b/src/lib/openjpip/libopenjpip.pc.cmake.in |
476 |
-@@ -1,9 +1,9 @@ |
477 |
- prefix=@CMAKE_INSTALL_PREFIX@ |
478 |
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ |
479 |
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ |
480 |
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ |
481 |
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ |
482 |
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ |
483 |
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ |
484 |
-+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ |
485 |
-+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ |
486 |
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
487 |
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ |
488 |
- |
489 |
- Name: openjpip |
490 |
- Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9) |
491 |
-diff --git a/src/lib/openjpwl/CMakeLists.txt b/src/lib/openjpwl/CMakeLists.txt |
492 |
-index 1b33adbe..bb90c87c 100644 |
493 |
---- a/src/lib/openjpwl/CMakeLists.txt |
494 |
-+++ b/src/lib/openjpwl/CMakeLists.txt |
495 |
-@@ -58,7 +58,7 @@ endif() |
496 |
- # Install library |
497 |
- install(TARGETS openjpwl |
498 |
- EXPORT OpenJPEGTargets |
499 |
-- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications |
500 |
-- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
501 |
-- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries |
502 |
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
503 |
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
504 |
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries |
505 |
- ) |
506 |
-diff --git a/src/lib/openjpwl/libopenjpwl.pc.cmake.in b/src/lib/openjpwl/libopenjpwl.pc.cmake.in |
507 |
-index b1244197..8acc1457 100644 |
508 |
---- a/src/lib/openjpwl/libopenjpwl.pc.cmake.in |
509 |
-+++ b/src/lib/openjpwl/libopenjpwl.pc.cmake.in |
510 |
-@@ -1,9 +1,9 @@ |
511 |
- prefix=@CMAKE_INSTALL_PREFIX@ |
512 |
--bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ |
513 |
--mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ |
514 |
--docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ |
515 |
--libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ |
516 |
--includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ |
517 |
-+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ |
518 |
-+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ |
519 |
-+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ |
520 |
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
521 |
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ |
522 |
- |
523 |
- Name: openjpwl |
524 |
- Description: JPEG2000 Wireless library (Part 11) |
525 |
-diff --git a/src/lib/openmj2/CMakeLists.txt b/src/lib/openmj2/CMakeLists.txt |
526 |
-index 25294b20..dced53f6 100644 |
527 |
---- a/src/lib/openmj2/CMakeLists.txt |
528 |
-+++ b/src/lib/openmj2/CMakeLists.txt |
529 |
-@@ -53,12 +53,12 @@ endif() |
530 |
- # Install library |
531 |
- install(TARGETS ${OPENMJ2_LIBRARY_NAME} |
532 |
- EXPORT OpenMJ2Targets |
533 |
-- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} |
534 |
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR} |
535 |
- COMPONENT Libraries |
536 |
- ) |
537 |
- |
538 |
- # Install includes files |
539 |
- #install(FILES mj2.h |
540 |
--# DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir} |
541 |
-+# DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} |
542 |
- # COMPONENT Headers |
543 |
- #) |
544 |
-diff --git a/wrapping/java/openjp2/CMakeLists.txt b/wrapping/java/openjp2/CMakeLists.txt |
545 |
-index eb3da0ed..4504da5f 100644 |
546 |
---- a/wrapping/java/openjp2/CMakeLists.txt |
547 |
-+++ b/wrapping/java/openjp2/CMakeLists.txt |
548 |
-@@ -69,5 +69,5 @@ add_custom_target(OpenJPEGJavaJar ALL |
549 |
- ) |
550 |
- |
551 |
- install(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar |
552 |
-- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule |
553 |
-+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule |
554 |
- ) |