diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-02-13 14:19:08 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-14 08:25:59 +0000 |
| commit | 6d2ed7646d91fca2f285f7998bc6fb84f071aa6a (patch) | |
| tree | 5bf6c19ed76298c4b89e3cb66909092a54c2a6f6 | |
| parent | 2489a43676466f9ffde2ecdcca15009b336b22e3 (diff) | |
| download | qtwebengine-6d2ed7646d91fca2f285f7998bc6fb84f071aa6a.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
Change-Id: I9fd90c96d733154b912acf4e9c7f06c17a39b244
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 34337238826471f2229453320645d3124d8a51e5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | configure.cmake | 6 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/pdf/CMakeLists.txt | 4 |
3 files changed, 11 insertions, 1 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") diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 3b5d94148..ddc870b2e 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -406,7 +406,7 @@ foreach(arch ${archs}) ozone_extra_path="${CMAKE_CURRENT_LIST_DIR}/ozone/ozone_extra.gni" ) set(systemLibs libjpeg libpng freetype harfbuzz libevent libwebp libxml - opus snappy libvpx icu ffmpeg re2 lcms2 + opus snappy libvpx icu ffmpeg re2 lcms2 libopenjpeg2 ) foreach(slib ${systemLibs}) extend_gn_list(gnArgArg diff --git a/src/pdf/CMakeLists.txt b/src/pdf/CMakeLists.txt index 5f082e918..1d42ee727 100644 --- a/src/pdf/CMakeLists.txt +++ b/src/pdf/CMakeLists.txt @@ -123,6 +123,10 @@ foreach(arch ${archs}) ARGS use_system_icu CONDITION QT_FEATURE_webengine_system_icu ) + extend_gn_list(gnArgArg + ARGS use_system_libopenjpeg2 + CONDITION QT_FEATURE_webengine_system_libopenjpeg2 + ) endif() if(MACOS) list(APPEND gnArgArg angle_enable_vulkan=false) |