diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-12-14 16:42:50 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2022-03-09 12:31:16 +0100 |
| commit | 99d77b9f1eed817cb3eae68d9e7224a01d55d656 (patch) | |
| tree | edfe0bb696ccad9fc9d5a84358675e1aaa455f6d /configure.cmake | |
| parent | e6e705a3dab368842fbfe15a9b545e0e8727b6b2 (diff) | |
Add static builds for qtpdf
Add 3rdparty installed headers so static builds can
use bundled qt libs.
Fix static gn and archiver/librarian setup.
Updates 3rdparty:
* 5d88de975 Fix static build with qt3rdparty libs
Task-number: QTBUG-87154
Task-number: QTBUG-88614
Pick-to: 6.3 6.2
Change-Id: Iad7682da92b558b500140f415acc0bc9c9a1c22e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/configure.cmake b/configure.cmake index 3baf5d4ad..7d92341f8 100644 --- a/configure.cmake +++ b/configure.cmake @@ -305,6 +305,12 @@ qt_feature("webengine-system-zlib" PRIVATE LABEL "zlib" CONDITION UNIX AND QT_FEATURE_system_zlib AND ZLIB_FOUND ) +qt_feature("webengine-qt-zlib" PRIVATE + LABEL "qtzlib" + CONDITION QT_FEATURE_static + AND TARGET Qt::Gui + AND NOT QT_FEATURE_system_zlib +) qt_feature("webengine-system-minizip" PRIVATE LABEL "minizip" CONDITION UNIX AND MINIZIP_FOUND @@ -326,18 +332,47 @@ qt_feature("webengine-system-libpng" PRIVATE LABEL "png" CONDITION UNIX AND TARGET Qt::Gui AND PNG_FOUND AND QT_FEATURE_system_png ) +qt_feature("webengine-qt-libpng" PRIVATE + LABEL "qtpng" + CONDITION QT_FEATURE_static + AND TARGET Qt::Gui + AND QT_FEATURE_png + AND NOT QT_FEATURE_system_png +) qt_feature("webengine-system-libjpeg" PRIVATE LABEL "jpeg" CONDITION UNIX AND TARGET Qt::Gui AND TEST_jpeg AND QT_FEATURE_system_jpeg ) +qt_feature("webengine-qt-libjpeg" PRIVATE + LABEL "qtjpeg" + CONDITION QT_FEATURE_static + AND TARGET Qt::Gui + AND QT_FEATURE_jpeg + AND NOT QT_FEATURE_system_jpeg + AND FALSE # FIXME requires qtbase dep update +) qt_feature("webengine-system-harfbuzz" PRIVATE LABEL "harfbuzz" CONDITION UNIX AND TARGET Qt::Gui AND HARFBUZZ_FOUND AND QT_FEATURE_system_harfbuzz ) +qt_feature("webengine-qt-harfbuzz" PRIVATE + LABEL "qtpng" + CONDITION QT_FEATURE_static + AND TARGET Qt::Gui + AND QT_FEATURE_harfbuzz + AND NOT QT_FEATURE_system_harfbuzz +) qt_feature("webengine-system-freetype" PRIVATE LABEL "freetype" CONDITION UNIX AND TARGET Qt::Gui AND TEST_freetype AND QT_FEATURE_system_freetype ) +qt_feature("webengine-qt-freetype" PRIVATE + LABEL "qtfreetype" + CONDITION QT_FEATURE_static + AND TARGET Qt::Gui + AND QT_FEATURE_freetype + AND NOT QT_FEATURE_system_freetype +) qt_feature("webengine-system-libpci" PRIVATE LABEL "libpci" CONDITION UNIX AND LIBPCI_FOUND @@ -548,6 +583,16 @@ if(UNIX) qt_configure_add_summary_entry(ARGS "webengine-system-libpci") qt_configure_end_summary_section() endif() + +if(QT_FEATURE_static) + qt_configure_add_summary_section(NAME "Qt 3rdparty libs") + qt_configure_add_summary_entry(ARGS "webengine-qt-freetype") + qt_configure_add_summary_entry(ARGS "webengine-qt-harfbuzz") + qt_configure_add_summary_entry(ARGS "webengine-qt-libpng") + qt_configure_add_summary_entry(ARGS "webengine-qt-libjpeg") + qt_configure_add_summary_entry(ARGS "webengine-qt-zlib") +endif() + # << Optional system libraries qt_configure_end_summary_section() # < Qt WebEngine Build Features |