1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Write QT_MAC_SDK_VERSION into qconfig.pri

Browse Source 
Task-number: QTBUG-84781
Change-Id: I9f4e979a7404dd45286e0a85a6f3772e53a2fd0b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-06-17 11:02:22 +02:00
parent 435fe4b13d
commit 9862cb4532
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cmake/QtAutoDetect.cmake
View File

@ -194,6 +194,31 @@ function(qt_auto_detect_cyclic_toolchain)
endif() endif()
endfunction() endfunction()
function(qt_internal_get_darwin_sdk_version out_var)
if(APPLE)
if(IOS)
set(sdk_name "iphoneos")
elseif(TVOS)
set(sdk_name "appletvos")
elseif(WATCHOS)
set(sdk_name "watchos")
else()
# Default to macOS
set(sdk_name "macosx")
endif()
set(xcrun_version_arg "--show-sdk-version")
execute_process(COMMAND /usr/bin/xcrun --sdk ${sdk_name} ${xcrun_version_arg}
OUTPUT_VARIABLE sdk_version
ERROR_VARIABLE xcrun_error)
if(NOT sdk_version)
message(FATAL_ERROR
"Can't determine darwin ${sdk_name} SDK version. Error: ${xcrun_error}")
endif()
string(STRIP "${sdk_version}" sdk_version)
set(${out_var} "${sdk_version}" PARENT_SCOPE)
endif()
endfunction()
function(qt_auto_detect_darwin) function(qt_auto_detect_darwin)
if(APPLE) if(APPLE)
# If no CMAKE_OSX_DEPLOYMENT_TARGET is provided, default to a value that Qt defines. # If no CMAKE_OSX_DEPLOYMENT_TARGET is provided, default to a value that Qt defines.
@ -220,6 +245,11 @@ function(qt_auto_detect_darwin)
message(STATUS message(STATUS
"CMAKE_OSX_DEPLOYMENT_TARGET set to: \"${CMAKE_OSX_DEPLOYMENT_TARGET}\".") "CMAKE_OSX_DEPLOYMENT_TARGET set to: \"${CMAKE_OSX_DEPLOYMENT_TARGET}\".")
endif() endif()
qt_internal_get_darwin_sdk_version(darwin_sdk_version)
set(QT_MAC_SDK_VERSION "${darwin_sdk_version}" CACHE STRING "Darwin SDK version.")
message(STATUS
"QT_MAC_SDK_VERSION set to: \"${QT_MAC_SDK_VERSION}\".")
endif() endif()
endfunction() endfunction()

4
cmake/QtBuild.cmake
View File

@ -1139,6 +1139,10 @@ function(qt_generate_global_config_pri_file)
"${compiler_version_patch_var_name} = ${QT_COMPILER_VERSION_PATCH}") "${compiler_version_patch_var_name} = ${QT_COMPILER_VERSION_PATCH}")
endif() endif()
if(APPLE)
list(APPEND extra_statements "QT_MAC_SDK_VERSION = ${QT_MAC_SDK_VERSION}")
endif()
list(APPEND extra_statements "QT_EDITION = Open Source") list(APPEND extra_statements "QT_EDITION = Open Source")
if(extra_statements) if(extra_statements)