diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-08-13 09:35:59 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-08-13 19:31:59 +0200 |
| commit | fb8aea60bde5b3b3b5c1fcf263a86f5c6232c6bd (patch) | |
| tree | 4b88f3e01154d1402d3a9d7731e5958afd4f606f /cmake | |
| parent | edc8c1ee9dce369af8cb26a179df21d0befd1fa0 (diff) | |
| download | qtbase-fb8aea60bde5b3b3b5c1fcf263a86f5c6232c6bd.tar.gz | |
CMake: Write QMAKE_MACOSX_DEPLOYMENT_TARGET to qconfig.pri
If the user specified CMAKE_OSX_DEPLOYMENT_TARGET=10.15 for the Qt
build then building projects with qmake failed, because the mkspec
hard-codes QMAKE_MACOSX_DEPLOYMENT_TARGET to 10.14.
We now write QMAKE_MACOSX_DEPLOYMENT_TARGET to qconfig.pri to override
the mkspecs' default.
Fixes: QTBUG-85923
Change-Id: I6a39cfe047ac0f99e1da0ca0728d63c741bd4fed
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 4d9336eb61..dfe254c178 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1238,6 +1238,8 @@ QT_PATCH_VERSION = ${PROJECT_VERSION_PATCH} if(APPLE) list(APPEND extra_statements "QT_MAC_SDK_VERSION = ${QT_MAC_SDK_VERSION}") + list(APPEND extra_statements + "QMAKE_MACOSX_DEPLOYMENT_TARGET = ${CMAKE_OSX_DEPLOYMENT_TARGET}") endif() list(APPEND extra_statements "QT_EDITION = Open Source") |