From 578cbf568867d2b4182648d2772613c0db7be83b Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 20 Apr 2022 10:43:18 +0200 Subject: 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 --- cmake/Functions.cmake | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'cmake') 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) -- cgit v1.2.1