diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2023-03-16 09:20:26 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2023-03-30 01:17:15 +0200 |
| commit | a38a3aee68e796266ef6478d87d133ce1a5102c9 (patch) | |
| tree | ad2b678256185fee1351e2e937c2a962bd9d8e31 | |
| parent | 60d386ba9410f2d64dd816ce28fdaf7f1f7dfa49 (diff) | |
| download | qtwebengine-a38a3aee68e796266ef6478d87d133ce1a5102c9.tar.gz | |
Drop perl dependency for third party opus
Opus needs perl to do some optimizations, in case there is no
perl print the warning and drop the perl requirement.
Fixes: QTBUG-111958
Pick-to: 6.5
Change-Id: I63a66e71fdaeae61d5c9dbcfe41f03bfb717bb75
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
| -rw-r--r-- | configure.cmake | 8 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/configure.cmake b/configure.cmake index 0b216a830..c5e561b12 100644 --- a/configure.cmake +++ b/configure.cmake @@ -18,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) @@ -686,3 +687,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() + diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 6532ca356..0ecdf6c3f 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 3.19) find_package(Ninja 1.7.2 REQUIRED) find_package(Nodejs 12 REQUIRED) +find_package(Perl) find_package(PkgConfig) if(PkgConfig_FOUND) create_pkg_config_host_wrapper(${CMAKE_CURRENT_BINARY_DIR}) @@ -418,6 +419,12 @@ foreach(arch ${archs}) CONDITION QT_FEATURE_webengine_system_${slib} ) endforeach() + if(NOT QT_FEATURE_webengine_system_opus) + extend_gn_list(gnArgArg + ARGS has_perl + CONDITION Perl_FOUND + ) + endif() extend_gn_list(gnArgArg ARGS use_system_libxslt CONDITION QT_FEATURE_webengine_system_libxml |