diff options
| author | Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> | 2022-03-23 08:51:42 +0000 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2022-04-07 10:00:17 +0000 |
| commit | 288f60442fefa717dfc3c7587f1d480910b50874 (patch) | |
| tree | 2cfafa2d66bdfcbbe35dccd1db8679de7ad7e18e /cmake | |
| parent | 8018a4cbce8f01add2aa011b3448516cb6ea92ef (diff) | |
| download | qtwebengine-288f60442fefa717dfc3c7587f1d480910b50874.tar.gz | |
Fix build with libc++
Fix build with libc++ on linux by adding missing use_libcxx
parameter.
Check if re2 and poppler can be used as they use std::string in
their api. Add compiler test to check that.
Pick-to: 6.3 6.2
Change-Id: I74bf79b8443ad470621c1a2e0c9dc768d4cca1f1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Functions.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index 08967d6db..77fef2114 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -880,6 +880,9 @@ macro(append_compiler_linker_sdk_setup) ios_enable_code_signing=false ) endif() + extend_gn_list(gnArgArg ARGS use_libcxx + CONDITION QT_FEATURE_stdlib_libcpp OR MACOS + ) else() if(QT_FEATURE_use_lld_linker) get_filename_component(clangBasePath ${CMAKE_LINKER} DIRECTORY) |