diff options
Diffstat (limited to 'cmake/QtAutoDetectHelpers.cmake')
| -rw-r--r-- | cmake/QtAutoDetectHelpers.cmake | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/cmake/QtAutoDetectHelpers.cmake b/cmake/QtAutoDetectHelpers.cmake index 9120e3cf62..5621888308 100644 --- a/cmake/QtAutoDetectHelpers.cmake +++ b/cmake/QtAutoDetectHelpers.cmake @@ -137,9 +137,9 @@ function(qt_auto_detect_android) # ANDROID_NATIVE_API_LEVEL is an just an alias to ANDROID_PLATFORM, check for both if(NOT DEFINED ANDROID_PLATFORM AND NOT DEFINED ANDROID_NATIVE_API_LEVEL) message(STATUS "Neither ANDROID_PLATFORM nor ANDROID_NATIVE_API_LEVEL" - " were specified, using API level 23 as default") - set(ANDROID_PLATFORM "android-23" CACHE STRING "") - set(ANDROID_NATIVE_API_LEVEL 23 CACHE STRING "") + " were specified, using API level 28 as default") + set(ANDROID_PLATFORM "android-28" CACHE STRING "") + set(ANDROID_NATIVE_API_LEVEL 28 CACHE STRING "") endif() if(NOT DEFINED ANDROID_STL) set(ANDROID_STL "c++_shared" CACHE STRING "") @@ -184,6 +184,8 @@ function(qt_auto_detect_apple) if("${QT_QMAKE_TARGET_MKSPEC}" STREQUAL "macx-ios-clang") set(CMAKE_SYSTEM_NAME "iOS" CACHE STRING "") + elseif("${QT_QMAKE_TARGET_MKSPEC}" STREQUAL "macx-visionos-clang") + set(CMAKE_SYSTEM_NAME "visionOS" CACHE STRING "") endif() if(CMAKE_SYSTEM_NAME STREQUAL iOS) @@ -226,13 +228,14 @@ function(qt_auto_detect_apple) endif() endif() - # For non simulator_and_device builds, we need to explicitly set the SYSROOT aka the sdk - # value. - if(QT_APPLE_SDK) - set(CMAKE_OSX_SYSROOT "${QT_APPLE_SDK}" CACHE STRING "") - endif() set(CMAKE_OSX_ARCHITECTURES "${osx_architectures}" CACHE STRING "") + endif() + + if(QT_APPLE_SDK) + set(CMAKE_OSX_SYSROOT "${QT_APPLE_SDK}" CACHE STRING "") + endif() + if(CMAKE_SYSTEM_NAME STREQUAL iOS OR CMAKE_SYSTEM_NAME STREQUAL visionOS) if(NOT DEFINED BUILD_SHARED_LIBS) qt_internal_ensure_static_qt_config() endif() |