diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-02-13 14:19:08 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-02-13 14:00:28 +0000 |
commit | 34337238826471f2229453320645d3124d8a51e5 (patch) | |
tree | d4f84b0cb38c5714b65efbfa139cc0cf7d5a758d /configure.cmake | |
parent | 7b8f5acf0adb02d438b0a0fb926b17c004f0a035 (diff) | |
download | qtwebengine-34337238826471f2229453320645d3124d8a51e5.tar.gz |
Add option to build using system OpenJPEG 2
Adds a check on Unix system for the presence of a system OpenJPEG 2
library and builds against it if present.
Task-number: QTBUG-63889
Pick-to: 6.5
Change-Id: I9fd90c96d733154b912acf4e9c7f06c17a39b244
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'configure.cmake')
-rw-r--r-- | configure.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/configure.cmake b/configure.cmake index 2119e0195..7fcbbc044 100644 --- a/configure.cmake +++ b/configure.cmake @@ -53,6 +53,7 @@ if(PkgConfig_FOUND) pkg_check_modules(OPUS opus>=1.3.1) pkg_check_modules(VPX vpx>=1.10.0 IMPORTED_TARGET) pkg_check_modules(LIBPCI libpci) + pkg_check_modules(LIBOPENJP2 libopenjp2) endif() if(Python3_EXECUTABLE) @@ -328,6 +329,10 @@ qt_feature("webengine-system-libwebp" PRIVATE LABEL "libwebp, libwebpmux and libwebpdemux" CONDITION UNIX AND WEBP_FOUND ) +qt_feature("webengine-system-libopenjpeg2" PRIVATE + LABEL "libopenjpeg2" + CONDITION UNIX AND LIBOPENJP2_FOUND +) qt_feature("webengine-system-opus" PRIVATE LABEL "opus" CONDITION UNIX AND OPUS_FOUND @@ -636,6 +641,7 @@ if(UNIX) qt_configure_add_summary_entry(ARGS "webengine-system-lcms2") qt_configure_add_summary_entry(ARGS "webengine-system-libpng") qt_configure_add_summary_entry(ARGS "webengine-system-libjpeg") + qt_configure_add_summary_entry(ARGS "webengine-system-libopenjpeg2") qt_configure_add_summary_entry(ARGS "webengine-system-harfbuzz") qt_configure_add_summary_entry(ARGS "webengine-system-freetype") qt_configure_add_summary_entry(ARGS "webengine-system-libpci") |