mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[qt5-base] fix building with mac dynamic triplet (#32500)
This commit is contained in:
parent
9c7ddcae77
commit
ca4640a202
@ -289,6 +289,14 @@ elseif(VCPKG_TARGET_IS_LINUX)
|
||||
list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_TYPES_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread")
|
||||
endif()
|
||||
elseif(VCPKG_TARGET_IS_OSX)
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
# Avoid frameworks for vcpkg
|
||||
list(APPEND CORE_OPTIONS -no-framework)
|
||||
# Such that Qt executables like moc find their libs. The default path is ../Frameworks
|
||||
list(APPEND DEBUG_OPTIONS -R ${CURRENT_INSTALLED_DIR}/debug/lib)
|
||||
list(APPEND RELEASE_OPTIONS -R ${CURRENT_INSTALLED_DIR}/lib)
|
||||
endif()
|
||||
|
||||
list(APPEND CORE_OPTIONS -fontconfig)
|
||||
if("${VCPKG_TARGET_ARCHITECTURE}" MATCHES "arm64")
|
||||
FILE(READ "${SOURCE_PATH}/mkspecs/common/macx.conf" _tmp_contents)
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "qt5-base",
|
||||
"version": "5.15.10",
|
||||
"port-version": 2,
|
||||
"port-version": 3,
|
||||
"description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
|
||||
"homepage": "https://www.qt.io/",
|
||||
"license": null,
|
||||
|
@ -6618,7 +6618,7 @@
|
||||
},
|
||||
"qt5-base": {
|
||||
"baseline": "5.15.10",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"qt5-canvas3d": {
|
||||
"baseline": "0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "527c937f1bc15252b1397447900bc93c13f16b5e",
|
||||
"version": "5.15.10",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "47eb2c538dd9220fcf44ca6a72f1aa64e4fb8d26",
|
||||
"version": "5.15.10",
|
||||
|
Loading…
x
Reference in New Issue
Block a user