Skip to content

Commit 85190ff

Browse files
dlemstradlemstra
committed
Upgraded openjpeg to version 2.5.2.
1 parent 5e2e3d7 commit 85190ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+961
-730
lines changed

‎CHANGELOG.md

+80
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,85 @@
11
# Changelog
22

3+
## [v2.5.2](https://github.com/uclouvain/openjpeg/releases/v2.5.2) (2024-02-28)
4+
5+
[Full Changelog](https://github.com/uclouvain/openjpeg/compare/v2.5.1...v2.5.2)
6+
7+
**Closed issues:**
8+
9+
- API breakage in 2.5.1 / openjpeg version no longer detected \(openjpeg.h no longer includes opj\_config.h\) [\#1514](https://github.com/uclouvain/openjpeg/issues/1514)
10+
11+
**Merged pull requests:**
12+
13+
- openjpeg.h: make sure to include opj\_config.h \(fixes \#1514\) [\#1515](https://github.com/uclouvain/openjpeg/pull/1515) ([rouault](https://github.com/rouault))
14+
15+
## [v2.5.1](https://github.com/uclouvain/openjpeg/releases/v2.5.1) (2024-02-26)
16+
17+
[Full Changelog](https://github.com/uclouvain/openjpeg/compare/v2.5.0...v2.5.1)
18+
19+
**Closed issues:**
20+
21+
- Exist a undefined-behavior issue in file src/lib/openjp2/dwt.c:2124 [\#1505](https://github.com/uclouvain/openjpeg/issues/1505)
22+
- Potential double-free vulnerability in j2k.c [\#1498](https://github.com/uclouvain/openjpeg/issues/1498)
23+
- opj\_compress -I / -mct 0 should conflict each others [\#1485](https://github.com/uclouvain/openjpeg/issues/1485)
24+
- Exist a undefined-behavior issue in file src/lib/openjp2/tcd.c:2327 [\#1480](https://github.com/uclouvain/openjpeg/issues/1480)
25+
- OOM in opj\_decompress [\#1476](https://github.com/uclouvain/openjpeg/issues/1476)
26+
- v2.5.0 cannot be built successfully on aarch64 CentOS machine [\#1475](https://github.com/uclouvain/openjpeg/issues/1475)
27+
- \[ Heap Overflow \] opj\_decompress [\#1473](https://github.com/uclouvain/openjpeg/issues/1473)
28+
- Possible bug reading JP2 as grayscale when should be in color [\#1464](https://github.com/uclouvain/openjpeg/issues/1464)
29+
- Crashes due to internal bad memory references when using reduce on a truncated file. [\#1459](https://github.com/uclouvain/openjpeg/issues/1459)
30+
- No error.h \(non standard compliant\) [\#1453](https://github.com/uclouvain/openjpeg/issues/1453)
31+
- JP2 File incorrectly decompressed to noise [\#1447](https://github.com/uclouvain/openjpeg/issues/1447)
32+
- UB in tcd.c opj\_tcd\_dc\_level\_shift\_decode - pointer arithmetic on NULL pointer [\#1445](https://github.com/uclouvain/openjpeg/issues/1445)
33+
- UB in ht\_dec.c opj\_t1\_ht\_decode\_cblk - memcpy invoked on NULL pointer [\#1444](https://github.com/uclouvain/openjpeg/issues/1444)
34+
- Integer Overflow in `src/lib/openjp2/image.c` [\#1438](https://github.com/uclouvain/openjpeg/issues/1438)
35+
- Integer-overflow · opj\_t1\_encode\_cblk [\#1432](https://github.com/uclouvain/openjpeg/issues/1432)
36+
- OSX m1 v2.5.0 build fail [\#1430](https://github.com/uclouvain/openjpeg/issues/1430)
37+
- Pixel value could be changed by 0-4 after compression and decompression [\#1429](https://github.com/uclouvain/openjpeg/issues/1429)
38+
- Cannot determine library version at compile time [\#1428](https://github.com/uclouvain/openjpeg/issues/1428)
39+
- ARM builds on Windows unsupported with Version 2.5.0 [\#1422](https://github.com/uclouvain/openjpeg/issues/1422)
40+
- opj\_decompress heap overflow Denial of Service issue [\#1413](https://github.com/uclouvain/openjpeg/issues/1413)
41+
- Color chanel swapping for some JPEG2000 pictures [\#1382](https://github.com/uclouvain/openjpeg/issues/1382)
42+
- Heap-buffer-overflow in color.c:379:42 in sycc420\_to\_rgb [\#1347](https://github.com/uclouvain/openjpeg/issues/1347)
43+
- No colorspace information after opj\_read\_header [\#570](https://github.com/uclouvain/openjpeg/issues/570)
44+
45+
**Merged pull requests:**
46+
47+
- opj\_t2\_read\_packet\_header\(\): avoid unsigned integer overflow [\#1511](https://github.com/uclouvain/openjpeg/pull/1511) ([rouault](https://github.com/rouault))
48+
- opj\_dwt\_decode\_tile\(\): avoid potential UndefinedBehaviorSanitizer 'applying zero offset to null pointer' \(fixes \#1505\) [\#1510](https://github.com/uclouvain/openjpeg/pull/1510) ([rouault](https://github.com/rouault))
49+
- opj\_decompress: fix off-by-one read heap-buffer-overflow in sycc420\_to\_rgb\(\) when x0 and y0 are odd \(CVE-2021-3575, fixes \#1347\) [\#1509](https://github.com/uclouvain/openjpeg/pull/1509) ([rouault](https://github.com/rouault))
50+
- Always install pkgconfig files [\#1507](https://github.com/uclouvain/openjpeg/pull/1507) ([kmilos](https://github.com/kmilos))
51+
- CMake: drop support for cmake \< 3.5 [\#1503](https://github.com/uclouvain/openjpeg/pull/1503) ([domin144](https://github.com/domin144))
52+
- Fix compiler error on Windows [\#1502](https://github.com/uclouvain/openjpeg/pull/1502) ([scaramallion](https://github.com/scaramallion))
53+
- opj\_tcd\_dc\_level\_shift\_decode\(\): avoid increment nullptr \(fixes \#1480\) [\#1496](https://github.com/uclouvain/openjpeg/pull/1496) ([rouault](https://github.com/rouault))
54+
- Fix CI [\#1495](https://github.com/uclouvain/openjpeg/pull/1495) ([rouault](https://github.com/rouault))
55+
- suppress warning during build using clang [\#1494](https://github.com/uclouvain/openjpeg/pull/1494) ([tomoaki0705](https://github.com/tomoaki0705))
56+
- Add cmake version file [\#1493](https://github.com/uclouvain/openjpeg/pull/1493) ([domin144](https://github.com/domin144))
57+
- fix ht\_dec.c:1215 [\#1492](https://github.com/uclouvain/openjpeg/pull/1492) ([headshog](https://github.com/headshog))
58+
- Integer Overflow at j2k.c:11114 [\#1491](https://github.com/uclouvain/openjpeg/pull/1491) ([headshog](https://github.com/headshog))
59+
- Integer Overflow at j2k.c:3962 [\#1490](https://github.com/uclouvain/openjpeg/pull/1490) ([headshog](https://github.com/headshog))
60+
- Fixed typos [\#1486](https://github.com/uclouvain/openjpeg/pull/1486) ([radarhere](https://github.com/radarhere))
61+
- Require `stdint.h` & `inttypes.h` [\#1484](https://github.com/uclouvain/openjpeg/pull/1484) ([mayeut](https://github.com/mayeut))
62+
- fix: use `opj_uint_ceildiv` instead of `opj_int_ceildiv` when necessary [\#1482](https://github.com/uclouvain/openjpeg/pull/1482) ([mayeut](https://github.com/mayeut))
63+
- ht\_dec.c: Improve MSVC arm64 popcount performance [\#1479](https://github.com/uclouvain/openjpeg/pull/1479) ([PeterJohnson](https://github.com/PeterJohnson))
64+
- opj\_jp2\_read\_header\(\): move setting color\_space here instead in opj\_jp2\_decode\(\)/get\_tile\(\) \(fixes \#570\) [\#1463](https://github.com/uclouvain/openjpeg/pull/1463) ([rouault](https://github.com/rouault))
65+
- CMake: error out on warnings for strict/missing prototypes. [\#1462](https://github.com/uclouvain/openjpeg/pull/1462) ([sebras](https://github.com/sebras))
66+
- Fix CI [\#1461](https://github.com/uclouvain/openjpeg/pull/1461) ([rouault](https://github.com/rouault))
67+
- opj\_t2\_skip\_packet\_data\(\): avoid out-of-bounds reads on truncated images in non-strict mode \(fixes \#1459\) [\#1460](https://github.com/uclouvain/openjpeg/pull/1460) ([rouault](https://github.com/rouault))
68+
- Fix \#1424 [\#1456](https://github.com/uclouvain/openjpeg/pull/1456) ([autoantwort](https://github.com/autoantwort))
69+
- openjp2/j2k: replace sprintf calls with snprintf [\#1450](https://github.com/uclouvain/openjpeg/pull/1450) ([markmentovai](https://github.com/markmentovai))
70+
- Fix incorrect decoding of image with large number of progression levels [\#1448](https://github.com/uclouvain/openjpeg/pull/1448) ([rouault](https://github.com/rouault))
71+
- Fix Heap-buffer-overflow READ in opj\_jp2\_apply\_pclr [\#1441](https://github.com/uclouvain/openjpeg/pull/1441) ([sashashura](https://github.com/sashashura))
72+
- Significant speed-up rate allocation by rate/distoratio ratio [\#1440](https://github.com/uclouvain/openjpeg/pull/1440) ([rouault](https://github.com/rouault))
73+
- Make OpenJPEGConfig.cmake relocatable with CMake \> 3.0 [\#1439](https://github.com/uclouvain/openjpeg/pull/1439) ([arichardson](https://github.com/arichardson))
74+
- Replace the assert in mel\_init to an if statement to address an issue with fuzzing. [\#1436](https://github.com/uclouvain/openjpeg/pull/1436) ([aous72](https://github.com/aous72))
75+
- opj\_t1\_encode\_cblk\(\): avoid undefined behaviour on fuzzed input \(fixes \#1432\) [\#1433](https://github.com/uclouvain/openjpeg/pull/1433) ([rouault](https://github.com/rouault))
76+
- Build: fix linking of executables on some systems where TIFF/LCMS2 static libraries are not in system directories \(fixes \#1430\) [\#1431](https://github.com/uclouvain/openjpeg/pull/1431) ([rouault](https://github.com/rouault))
77+
- Fix opj\_t1\_allocate\_buffers malloc size error [\#1426](https://github.com/uclouvain/openjpeg/pull/1426) ([zodf0055980](https://github.com/zodf0055980))
78+
- Switch to GNUInstallDirs \[v2\] [\#1424](https://github.com/uclouvain/openjpeg/pull/1424) ([laumann](https://github.com/laumann))
79+
- Fix windows arm builds [\#1423](https://github.com/uclouvain/openjpeg/pull/1423) ([Neumann-A](https://github.com/Neumann-A))
80+
- pkgconfig: Define OPJ\_STATIC for static linking with pkgconf [\#1421](https://github.com/uclouvain/openjpeg/pull/1421) ([Biswa96](https://github.com/Biswa96))
81+
82+
383
## [v2.5.0](https://github.com/uclouvain/openjpeg/releases/v2.5.0) (2022-05-13)
484

585
[Full Changelog](https://github.com/uclouvain/openjpeg/compare/v2.4.0...v2.5.0)

‎CMakeLists.txt

+59-100
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@
77
# For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like
88
# e.g.:
99
# set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
10-
cmake_minimum_required(VERSION 2.8.2)
11-
12-
if(COMMAND CMAKE_POLICY)
13-
cmake_policy(SET CMP0003 NEW)
14-
if (NOT (${CMAKE_VERSION} VERSION_LESS 3.0))
15-
cmake_policy(SET CMP0042 NEW)
16-
endif()
17-
endif()
10+
cmake_minimum_required(VERSION 3.5)
1811

1912
if(NOT OPENJPEG_NAMESPACE)
2013
set(OPENJPEG_NAMESPACE "OPENJPEG")
@@ -33,7 +26,7 @@ include_regular_expression("^.*$")
3326
# OPENJPEG version number, useful for packaging and doxygen doc:
3427
set(OPENJPEG_VERSION_MAJOR 2)
3528
set(OPENJPEG_VERSION_MINOR 5)
36-
set(OPENJPEG_VERSION_BUILD 0)
29+
set(OPENJPEG_VERSION_BUILD 2)
3730
set(OPENJPEG_VERSION
3831
"${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
3932
set(PACKAGE_VERSION
@@ -59,6 +52,8 @@ set(PACKAGE_VERSION
5952
# 2.3.1 | 7
6053
# 2.4.0 | 7
6154
# 2.5.0 | 7
55+
# 2.5.1 | 7
56+
# 2.5.2 | 7
6257
# above is the recommendation by the OPJ team. If you really need to override this default,
6358
# you can specify your own OPENJPEG_SOVERSION at cmake configuration time:
6459
# cmake -DOPENJPEG_SOVERSION:STRING=42 /path/to/openjpeg
@@ -105,64 +100,27 @@ endif()
105100

106101
# --------------------------------------------------------------------------
107102
# Install directories
103+
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME)
104+
include(GNUInstallDirs)
105+
108106
# Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
109107
option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
110108

111-
string(TOLOWER ${PROJECT_NAME} projectname)
112-
set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
113-
114-
if(NOT OPENJPEG_INSTALL_BIN_DIR)
115-
set(OPENJPEG_INSTALL_BIN_DIR "bin")
116-
endif()
117-
118-
if(NOT OPENJPEG_INSTALL_LIB_DIR)
119-
set(OPENJPEG_INSTALL_LIB_DIR "lib")
120-
endif()
121-
122-
if(NOT OPENJPEG_INSTALL_SHARE_DIR)
123-
set(OPENJPEG_INSTALL_SHARE_DIR "share")
124-
endif()
125-
126-
if(NOT OPENJPEG_INSTALL_DATA_DIR)
127-
set(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
128-
endif()
129-
130-
if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
131-
set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
132-
endif()
133-
134-
if(BUILD_DOC)
135-
if(NOT OPENJPEG_INSTALL_MAN_DIR)
136-
set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
137-
endif()
138-
139-
if(NOT OPENJPEG_INSTALL_DOC_DIR)
140-
set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
141-
endif()
142-
endif()
109+
set(OPENJPEG_INSTALL_SUBDIR "${PROJECT_NAME}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
143110

144111
if(NOT OPENJPEG_INSTALL_JNI_DIR)
145112
if(WIN32)
146-
set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
113+
set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR})
147114
else()
148-
set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
115+
set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR})
149116
endif()
150117
endif()
151118

152119
if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
153-
# We could install *.cmake files in share/ however those files contains
154-
# hardcoded path to libraries on a multi-arch system (fedora/debian) those
155-
# path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
156-
set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
120+
set(OPENJPEG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}")
157121
endif()
158122

159123
if (APPLE)
160-
if (${CMAKE_VERSION} VERSION_LESS 3.0)
161-
# For cmake >= 3.0, we turn on CMP0042 and
162-
# https://cmake.org/cmake/help/v3.0/policy/CMP0042.html mentions
163-
# "Projects wanting @rpath in a target’s install name may remove any setting of the INSTALL_NAME_DIR and CMAKE_INSTALL_NAME_DIR variables"
164-
list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}")
165-
endif()
166124
option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
167125
endif()
168126

@@ -206,7 +164,7 @@ if(CMAKE_COMPILER_IS_GNUCC)
206164
# set(CMAKE_C_FLAGS "-Wall -std=c99 ${CMAKE_C_FLAGS}") # FIXME: this setting prevented us from setting a coverage build.
207165
# Do not use ffast-math for all build, it would produce incorrect results, only set for release:
208166
set(OPENJPEG_LIBRARY_COMPILE_OPTIONS ${OPENJPEG_LIBRARY_COMPILE_OPTIONS} "$<$<CONFIG:Release>:-ffast-math>")
209-
set(OPENJP2_COMPILE_OPTIONS ${OPENJP2_COMPILE_OPTIONS} "$<$<CONFIG:Release>:-ffast-math>" -Wall -Wextra -Wconversion -Wunused-parameter -Wdeclaration-after-statement -Werror=declaration-after-statement)
167+
set(OPENJP2_COMPILE_OPTIONS ${OPENJP2_COMPILE_OPTIONS} "$<$<CONFIG:Release>:-ffast-math>" -Wall -Wextra -Wconversion -Wunused-parameter -Wdeclaration-after-statement -Werror=declaration-after-statement -Wstrict-prototypes -Werror=strict-prototypes -Wmissing-prototypes -Werror=missing-prototypes)
210168
endif()
211169

212170
#-----------------------------------------------------------------------------
@@ -215,20 +173,18 @@ endif()
215173
# Check if some include files are provided by the system
216174
include(EnsureFileInclude)
217175
# These files are mandatory
218-
ensure_file_include("string.h" HAVE_STRING_H YES)
219-
ensure_file_include("memory.h" HAVE_MEMORY_H YES)
220-
ensure_file_include("stdlib.h" HAVE_STDLIB_H YES)
221-
ensure_file_include("stdio.h" HAVE_STDIO_H YES)
222-
ensure_file_include("math.h" HAVE_MATH_H YES)
223-
ensure_file_include("float.h" HAVE_FLOAT_H YES)
224-
ensure_file_include("time.h" HAVE_TIME_H YES)
225-
ensure_file_include("stdarg.h" HAVE_STDARG_H YES)
226-
ensure_file_include("ctype.h" HAVE_CTYPE_H YES)
227-
ensure_file_include("assert.h" HAVE_ASSERT_H YES)
228-
229-
# For the following files, we provide an alternative, they are not mandatory
230-
ensure_file_include("stdint.h" OPJ_HAVE_STDINT_H NO)
231-
ensure_file_include("inttypes.h" OPJ_HAVE_INTTYPES_H NO)
176+
ensure_file_include("string.h" HAVE_STRING_H YES)
177+
ensure_file_include("memory.h" HAVE_MEMORY_H YES)
178+
ensure_file_include("stdlib.h" HAVE_STDLIB_H YES)
179+
ensure_file_include("stdio.h" HAVE_STDIO_H YES)
180+
ensure_file_include("math.h" HAVE_MATH_H YES)
181+
ensure_file_include("float.h" HAVE_FLOAT_H YES)
182+
ensure_file_include("time.h" HAVE_TIME_H YES)
183+
ensure_file_include("stdarg.h" HAVE_STDARG_H YES)
184+
ensure_file_include("ctype.h" HAVE_CTYPE_H YES)
185+
ensure_file_include("assert.h" HAVE_ASSERT_H YES)
186+
ensure_file_include("stdint.h" HAVE_STDINT_H YES)
187+
ensure_file_include("inttypes.h" HAVE_INTTYPES_H YES)
232188

233189
# why check this one ? for openjpip ?
234190
include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
@@ -335,50 +291,53 @@ if(BUILD_TESTING)
335291
endif()
336292

337293
#-----------------------------------------------------------------------------
338-
# install all targets referenced as OPENJPEGTargets
294+
# install all targets referenced as OPENJPEGTargets (relocatable with CMake 3.0+)
339295
install(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
340-
configure_file( ${${OPENJPEG_NAMESPACE}_SOURCE_DIR}/cmake/OpenJPEGConfig.cmake.in
341-
${${OPENJPEG_NAMESPACE}_BINARY_DIR}/OpenJPEGConfig.cmake
342-
@ONLY
343-
)
344-
install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
345-
DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
346-
)
296+
include(CMakePackageConfigHelpers)
297+
configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/cmake/OpenJPEGConfig.cmake.in
298+
${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
299+
INSTALL_DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
300+
PATH_VARS CMAKE_INSTALL_INCLUDEDIR)
301+
write_basic_package_version_file(
302+
${OPENJPEG_BINARY_DIR}/OpenJPEGConfigVersion.cmake
303+
COMPATIBILITY SameMajorVersion
304+
VERSION ${OPENJPEG_VERSION})
305+
install(
306+
FILES
307+
${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
308+
${OPENJPEG_BINARY_DIR}/OpenJPEGConfigVersion.cmake
309+
DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
347310

348311
#-----------------------------------------------------------------------------
349-
# install CHANGES and LICENSE
350-
if(BUILD_DOC)
351-
if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
352-
install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
353-
endif()
354-
355-
install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
356-
endif()
357312

358313
include (cmake/OpenJPEGCPack.cmake)
359314

360315
#-----------------------------------------------------------------------------
361316
# pkgconfig support
362-
# enabled by default on Unix or if using GCC, disabled by default on other platforms
363-
if(UNIX OR CMAKE_COMPILER_IS_GNUCC)
364-
option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" ON)
365-
else()
366-
option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" OFF)
367-
endif()
368-
if(BUILD_PKGCONFIG_FILES)
369-
# install in lib and not share (see multi-arch note above)
370-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
371-
${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
372-
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
373-
${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
317+
macro(set_variable_from_rel_or_absolute_path var root rel_or_abs_path)
318+
if(IS_ABSOLUTE "${rel_or_abs_path}")
319+
set(${var} "${rel_or_abs_path}")
320+
else()
321+
set(${var} "${root}/${rel_or_abs_path}")
322+
endif()
323+
endmacro()
324+
set_variable_from_rel_or_absolute_path("bindir" "\\\${prefix}" "${CMAKE_INSTALL_BINDIR}")
325+
set_variable_from_rel_or_absolute_path("mandir" "\\\${prefix}" "${CMAKE_INSTALL_MANDIR}")
326+
set_variable_from_rel_or_absolute_path("docdir" "\\\${prefix}" "${CMAKE_INSTALL_DOCDIR}")
327+
set_variable_from_rel_or_absolute_path("libdir" "\\\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
328+
set_variable_from_rel_or_absolute_path("includedir" "\\\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}")
329+
330+
# install in lib and not share (CMAKE_INSTALL_LIBDIR takes care of it for multi-arch)
331+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
332+
${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
333+
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
334+
${CMAKE_INSTALL_LIBDIR}/pkgconfig )
374335
#
375-
if(BUILD_JPIP)
376-
# install in lib and not share (see multi-arch note above)
336+
if(BUILD_JPIP)
377337
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
378338
${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
379339
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
380-
${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
381-
endif()
340+
${CMAKE_INSTALL_LIBDIR}/pkgconfig )
382341
endif()
383342

384343
#-----------------------------------------------------------------------------

0 commit comments

Comments
 (0)