diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-01-31 15:11:22 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2022-02-07 12:58:16 +0100 |
| commit | 1fbc256110da7f87d2b0c526d6e256c4e7ec7d5f (patch) | |
| tree | a6dfb8073be39cd77ab633630f9f8643a0856947 /src/core | |
| parent | 6cc86fd59f285054641fea7305f69886d41c9cc0 (diff) | |
Introduce gn complete static lib target for qtpdf
With 6.x we have gn-cmake integration which allows now
in case of static builds to switch gn target output to
static_library with 'complete static' option instead of
shared_library. This way we can avoid installing dependencies
in form of internal static Chromium archives as it was done
in 5.15 in case of static builds.
Unfortunately 'complete static' option can not be used with
QtWebEngineCore build as it will exceed 4Gb static archive
limitation on Windows, however it will work fine with QtPdf.
Note the qtbase 3rdparty static libs have to be still installed
in case of qt static build, this patch only eliminates need for
Chromium specific ones.
Task-number: QTBUG-88614
Change-Id: I6fc4ce48c79a1631b013d0b29c190c62280f7304
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
(cherry picked from commit 8e549e6e0ccd6078b3bd2e38b87337fd367dec55)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 3c1b67bf0..3eec61927 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -459,7 +459,7 @@ target_include_directories(WebEngineCore PRIVATE ${buildDir}/$<CONFIG>/${arch}/gen/third_party/perfetto/build_config ) -add_gn_build_aritfacts_to_target(WebEngineCore QtWebEngineCore core ${buildDir}) +add_gn_build_aritfacts_to_target(WebEngineCore QtWebEngineCore core ${buildDir} FALSE) add_dependencies(WebEngineCore run_core_NinjaDone) if(COIN_BUG_699) set_property(TARGET WebEngineCore PROPERTY CXX_LINKER_LAUNCHER ${PROJECT_BINARY_DIR}/linker_ulimit.sh) @@ -501,7 +501,7 @@ if(QT_FEATURE_webengine_spellchecker) ../3rdparty/chromium/third_party/boringssl/src/include ${buildDir}/$<CONFIG>/${arch}/gen ) - add_gn_build_aritfacts_to_target(${dict_target_name} convert_dict core ${buildDir}) + add_gn_build_aritfacts_to_target(${dict_target_name} convert_dict core ${buildDir} FALSE) add_dependencies(${dict_target_name} run_core_NinjaDone) add_dependencies(${dict_target_name} WebEngineCore) endif() |