Skip to content

Commit afb0329

Browse files
committed
ci: macOS: try harder to have macOS 10.13 as the minver for qt5 x64.
1 parent ed27123 commit afb0329

File tree

3 files changed

+26
-1
lines changed

3 files changed

+26
-1
lines changed

gui/qt/CMakePresets.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,13 @@
166166
},
167167
{
168168
"name": "Mac-x64-Qt5",
169-
"inherits": [ "Mac-x64-Qt6", "Qt5" ]
169+
"inherits": [ "Mac-x64-Qt6", "Qt5" ],
170+
"cacheVariables": {
171+
"VCPKG_TARGET_TRIPLET": {
172+
"type": "STRING",
173+
"value": "x64-osx-minver"
174+
}
175+
}
170176
},
171177
{
172178
"name": "Mac-arm64-Qt5",
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
set(VCPKG_BUILD_TYPE release)
2+
set(VCPKG_TARGET_ARCHITECTURE x64)
3+
set(VCPKG_CRT_LINKAGE dynamic)
4+
set(VCPKG_LIBRARY_LINKAGE static)
5+
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
6+
set(VCPKG_OSX_ARCHITECTURES x86_64)
7+
set(VCPKG_OSX_DEPLOYMENT_TARGET 10.13)
8+
set(VCPKG_C_FLAGS -mmacosx-version-min=10.13)
9+
set(VCPKG_CXX_FLAGS -mmacosx-version-min=10.13)
10+
set(VCPKG_BUILD_TYPE release)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
set(VCPKG_BUILD_TYPE release)
2+
set(VCPKG_TARGET_ARCHITECTURE x64)
3+
set(VCPKG_CRT_LINKAGE dynamic)
4+
set(VCPKG_LIBRARY_LINKAGE static)
5+
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
6+
set(VCPKG_OSX_ARCHITECTURES x86_64)
7+
set(VCPKG_OSX_DEPLOYMENT_TARGET 10.13)
8+
set(VCPKG_C_FLAGS -mmacosx-version-min=10.13)
9+
set(VCPKG_CXX_FLAGS -mmacosx-version-min=10.13)

0 commit comments

Comments
 (0)