mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 03:03:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[qt5] fix ambiguous option for vulkan feature (#23645)

Browse Source 
qt5-base[vulkan] feature will introduce --vulkan=yes or --vulkan=no option,
which redundants/confilicts with inherent option -no-vulkan,
which is ambiguous in configure stage.
This commit is contained in:
Fei Chong 2022-03-22 05:24:20 +08:00 committed by GitHub
parent 67f79d8799
commit bea991d2c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,7 +127,6 @@ list(APPEND CORE_OPTIONS
-system-sqlite -system-sqlite
-system-harfbuzz -system-harfbuzz
-icu -icu
-no-vulkan
-no-angle # Qt does not need to build angle. VCPKG will build angle! -no-angle # Qt does not need to build angle. VCPKG will build angle!
-no-glib -no-glib
) )

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

@ -1,7 +1,7 @@
{ {
"name": "qt5-base", "name": "qt5-base",
"version": "5.15.3", "version": "5.15.3",
"port-version": 1, "port-version": 2,
"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/",
"license": null, "license": null,

2
versions/baseline.json
View File

@ -5642,7 +5642,7 @@
}, },
"qt5-base": { "qt5-base": {
"baseline": "5.15.3", "baseline": "5.15.3",
"port-version": 1 "port-version": 2
}, },
"qt5-canvas3d": { "qt5-canvas3d": {
"baseline": "0", "baseline": "0",

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

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "abaaa592badf33576f197d915ed1f4ddd91d0931",
"version": "5.15.3",
"port-version": 2
},
{ {
"git-tree": "0b581b90072df50364b8c863110b2034a6b9f28e", "git-tree": "0b581b90072df50364b8c863110b2034a6b9f28e",
"version": "5.15.3", "version": "5.15.3",