diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-01-25 08:44:55 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2022-02-04 18:28:07 +0100 |
| commit | 8998563677e3f308083ba1c4c28efd6fe3d850f7 (patch) | |
| tree | 45514dad6dea3db885b758824b9d3571a8ef3eb6 /configure.cmake | |
| parent | 8e549e6e0ccd6078b3bd2e38b87337fd367dec55 (diff) | |
| download | qtwebengine-8998563677e3f308083ba1c4c28efd6fe3d850f7.tar.gz | |
Add QtPdf iOS builds
QtPDf iOS builds must support fat libs builds. Compared
to 5.15 however this is done differently. Before we tweaked gn
to compile multi arch with 'Xarch' parameter. This had few
downsides as we could not determine which arch/cpu compiles
given file as compilation was opaque to gn. The current approach is
to follow mac universal builds, compile builds separately for each
architecture and lipo the outcome. However, this introduces some
issues as ios builds are static builds and creating lipo archive
will gather object files, which should end up in final QtPdf lib
instead. Therefore create multi arch object file instead of archive
and use this one.
Note the compiler now uses arch triple for Pdfium as Chromium does,
however qt files still use 'arch' and '*-version-min' combination.
Task-number: QTBUG-88614
Pick-to: 6.3 6.2
Change-Id: I7775c8b4d1554df497eb61fa6187f12c00b9032d
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/configure.cmake b/configure.cmake index 397f51f70..86428d880 100644 --- a/configure.cmake +++ b/configure.cmake @@ -371,10 +371,15 @@ assertTargets( TARGETS Gui Quick Qml ) add_check_for_support( - MODULES QtWebEngine QtPdf + MODULES QtWebEngine CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR (MACOS AND NOT CMAKE_CROSSCOMPILING) MESSAGE "Build can be done only on Linux, Windows or macOS." ) +add_check_for_support( + MODULES QtPdf + CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR (MACOS AND NOT CMAKE_CROSSCOMPILING) OR IOS + MESSAGE "Build can be done only on Linux, Windows, macOS or iOS." +) if(LINUX AND CMAKE_CROSSCOMPILING) get_gn_arch(testArch ${TEST_architecture_arch}) add_check_for_support( @@ -384,7 +389,7 @@ if(LINUX AND CMAKE_CROSSCOMPILING) ) endif() add_check_for_support( - MODULES QtWebEngine QtPdf + MODULES QtWebEngine CONDITION NOT QT_FEATURE_static MESSAGE "Static build is not supported." ) @@ -476,7 +481,8 @@ add_check_for_support( (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL MSVC) OR (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL Clang AND CMAKE_CXX_SIMULATE_ID STREQUAL MSVC) OR - (MACOS AND CMAKE_CXX_COMPILER_ID STREQUAL AppleClang) + (MACOS AND CMAKE_CXX_COMPILER_ID STREQUAL AppleClang) OR + (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL AppleClang) MESSAGE "${CMAKE_CXX_COMPILER_ID} compiler is not supported." ) |