diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-04-20 10:43:18 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2022-05-01 12:15:53 +0200 |
| commit | 578cbf568867d2b4182648d2772613c0db7be83b (patch) | |
| tree | f8502f72dae806c0ab700267371e72bf9d8cbc1c /cmake/Functions.cmake | |
| parent | ef86f293d2d3778301536da1548884e9e2ca2093 (diff) | |
| download | qtwebengine-578cbf568867d2b4182648d2772613c0db7be83b.tar.gz | |
Check for stdlib_libcpp feature as it might not exist
Fixes undefined feature when compiling against 6.2.
Pick-to: 6.3
Change-Id: I186d0a0905bfb7d03cff07c2dd6316172efebc04
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'cmake/Functions.cmake')
| -rw-r--r-- | cmake/Functions.cmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index 44313d8cf..0346ff5d9 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -870,6 +870,7 @@ macro(append_compiler_linker_sdk_setup) use_system_xcode=true mac_deployment_target="${CMAKE_OSX_DEPLOYMENT_TARGET}" mac_sdk_min="${macSdkVersion}" + use_libcxx=true ) endif() if(IOS) @@ -878,11 +879,14 @@ macro(append_compiler_linker_sdk_setup) enable_ios_bitcode=true ios_deployment_target="${CMAKE_OSX_DEPLOYMENT_TARGET}" ios_enable_code_signing=false + use_libcxx=true + ) + endif() + if(DEFINED QT_FEATURE_stdlib_libcpp AND LINUX) + extend_gn_list(gnArgArg ARGS use_libcxx + CONDITION QT_FEATURE_stdlib_libcpp ) 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) |