3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 11:21:12 +08:00
Code Issues Projects Releases Wiki Activity

[qt5-*] Make QT and dependents build on arm macos (#18567)

Browse Source 
* [qt5-*] Make it build on ARM64 macos

* [qt5-base] update port version
This commit is contained in:
Lucius Q. User 2021-06-21 23:29:58 +03:00 committed by GitHub
parent a7d3367cec
commit d1d672d756
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/qt5-base/portfile.cmake
View File

@ -306,6 +306,11 @@ elseif(VCPKG_TARGET_IS_LINUX)
endif() endif()
elseif(VCPKG_TARGET_IS_OSX) elseif(VCPKG_TARGET_IS_OSX)
list(APPEND CORE_OPTIONS -fontconfig) list(APPEND CORE_OPTIONS -fontconfig)
if("${VCPKG_TARGET_ARCHITECTURE}" MATCHES "arm64")
FILE(READ "${SOURCE_PATH}/mkspecs/common/macx.conf" _tmp_contents)
string(REPLACE "QMAKE_APPLE_DEVICE_ARCHS = x86_64" "QMAKE_APPLE_DEVICE_ARCHS = arm64" _tmp_contents ${_tmp_contents})
FILE(WRITE "${SOURCE_PATH}/mkspecs/common/macx.conf" ${_tmp_contents})
endif()
if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET) if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET)
set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} ${VCPKG_OSX_DEPLOYMENT_TARGET}) set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} ${VCPKG_OSX_DEPLOYMENT_TARGET})
else() else()

2
ports/qt5-base/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "qt5-base", "name": "qt5-base",
"version-semver": "5.15.2", "version-semver": "5.15.2",
"port-version": 8, "port-version": 9,
"description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/", "homepage": "https://www.qt.io/",
"dependencies": [ "dependencies": [

2
versions/baseline.json
View File

@ -5090,7 +5090,7 @@
}, },
"qt5-base": { "qt5-base": {
"baseline": "5.15.2", "baseline": "5.15.2",
"port-version": 8 "port-version": 9
}, },
"qt5-canvas3d": { "qt5-canvas3d": {
"baseline": "0", "baseline": "0",

5
versions/q-/qt5-base.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "2362119eaacd46f6d1b0d27bac82b8851d84448f",
"version-semver": "5.15.2",
"port-version": 9
},
{ {
"git-tree": "78428fb3d23edf667e96afe8ea0292efc12e44a0", "git-tree": "78428fb3d23edf667e96afe8ea0292efc12e44a0",
"version-semver": "5.15.2", "version-semver": "5.15.2",