diff options
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/configure.cmake b/configure.cmake index e8f2a6a3b..835017d5f 100644 --- a/configure.cmake +++ b/configure.cmake @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + if(QT_CONFIGURE_RUNNING) function(assertTargets) endfunction() @@ -15,6 +18,7 @@ else() find_package(GPerf) find_package(BISON) find_package(FLEX) + find_package(Perl) find_package(PkgConfig) find_package(Snappy) find_package(Nodejs 12.0) @@ -34,14 +38,14 @@ if(PkgConfig_FOUND) pkg_check_modules(X11 x11) pkg_check_modules(XPROTO glproto) pkg_check_modules(GLIB glib-2.0>=2.32.0) - pkg_check_modules(HARFBUZZ harfbuzz>=2.9.0 harfbuzz-subset>=2.9.0) + pkg_check_modules(HARFBUZZ harfbuzz>=4.3.0 harfbuzz-subset>=4.3.0) pkg_check_modules(JPEG libjpeg IMPORTED_TARGET) pkg_check_modules(LIBEVENT libevent) pkg_check_modules(MINIZIP minizip) pkg_check_modules(PNG libpng>=1.6.0) pkg_check_modules(ZLIB zlib) pkg_check_modules(RE2 re2 IMPORTED_TARGET) - pkg_check_modules(ICU icu-uc>=68 icu-i18n>=68) + pkg_check_modules(ICU icu-uc>=70 icu-i18n>=70) pkg_check_modules(WEBP libwebp libwebpmux libwebpdemux) pkg_check_modules(LCMS2 lcms2) pkg_check_modules(FREETYPE freetype2 IMPORTED_TARGET) @@ -50,6 +54,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) @@ -327,6 +332,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 @@ -401,7 +410,7 @@ qt_feature("webengine-system-harfbuzz" PRIVATE CONDITION UNIX AND TARGET Qt::Gui AND HARFBUZZ_FOUND AND QT_FEATURE_system_harfbuzz ) qt_feature("webengine-qt-harfbuzz" PRIVATE - LABEL "qtpng" + LABEL "qtharfbuzz" CONDITION QT_FEATURE_static AND TARGET Qt::Gui AND QT_FEATURE_harfbuzz @@ -467,8 +476,8 @@ add_check_for_support( ) add_check_for_support( MODULES QtPdf - CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS - MESSAGE "Build can be done only on Linux, Windows, macOS or iOS." + CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS OR (ANDROID AND NOT CMAKE_HOST_WIN32) + MESSAGE "Build can be done only on Linux, Windows, macO, iOS and Android(on non-Windows hosts only)." ) if(LINUX AND CMAKE_CROSSCOMPILING) get_gn_arch(testArch ${TEST_architecture_arch}) @@ -577,7 +586,8 @@ add_check_for_support( (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL Clang AND CMAKE_CXX_SIMULATE_ID STREQUAL MSVC) OR (MACOS AND CMAKE_CXX_COMPILER_ID STREQUAL AppleClang) OR - (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL AppleClang) + (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL AppleClang) OR + (ANDROID AND CMAKE_CXX_COMPILER_ID STREQUAL Clang) MESSAGE "${CMAKE_CXX_COMPILER_ID} compiler is not supported." ) @@ -635,6 +645,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") @@ -677,3 +688,10 @@ if(PRINT_BFD_LINKER_WARNING) MESSAGE "Using bfd linker requires at least 4096 open files limit" ) endif() +if(NOT FEATURE_webengine_opus_system AND NOT Perl_FOUND) + qt_configure_add_report_entry( + TYPE WARNING + MESSAGE "No perl found, compiling opus without some optimizations." + ) +endif() + |