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

Pass CMAKE_OSX_SYSROOT to syncqt CMAKE_FLAGS

Browse Source 
Fixes: QTBUG-114803
Change-Id: I2eed5d6a7255eb61eff09d0c9a102e0652e63c0c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit a3ec70a92971342da0caf68e20c14ce16a0b39af)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2023-06-23 11:54:03 +02:00 committed by Qt Cherry-pick Bot
parent 87ccb0b481
commit 32466f5763
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/syncqt/CMakeLists.txt
View File

@ -31,6 +31,10 @@ else()
if(CMAKE_OSX_ARCHITECTURES) if(CMAKE_OSX_ARCHITECTURES)
set(osx_architectures "-DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}") set(osx_architectures "-DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}")
endif() endif()
if(CMAKE_OSX_SYSROOT)
set(osx_sysroot "-DCMAKE_OSX_SYSROOT:STRING=${CMAKE_OSX_SYSROOT}")
endif()
# Note: configure-time tools reserve the original tool name for the imported executable. # Note: configure-time tools reserve the original tool name for the imported executable.
# To re-build syncqt use 'syncqt_build' target. # To re-build syncqt use 'syncqt_build' target.
qt_internal_add_configure_time_tool(${target_name} qt_internal_add_configure_time_tool(${target_name}
@ -44,6 +48,7 @@ else()
# std::filesystem API is only available in macOS 10.15+ # std::filesystem API is only available in macOS 10.15+
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.15 -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.15
"${osx_architectures}" "${osx_architectures}"
"${osx_sysroot}"
SOURCES SOURCES
"${CMAKE_CURRENT_SOURCE_DIR}/main.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/main.cpp"
${config_type} ${config_type}