diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-04-20 08:11:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-19 17:11:20 -0700 |
| commit | 3f2616bc645972ab4ceee6054b83d1e89de09212 (patch) | |
| tree | 221495d25651da3165701b0d8c01e36b9b869d27 | |
| parent | 3e9fce266bcdecfea1c1a3d14420a2c82f687991 (diff) | |
| download | vcpkg-3f2616bc645972ab4ceee6054b83d1e89de09212.tar.gz vcpkg-3f2616bc645972ab4ceee6054b83d1e89de09212.zip | |
[qt5-base] Add feature vulkan (#16386)
* [qt5-base] Add feature vulkan
* update version record
* Update ports/qt5-base/vcpkg.json
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
* Update versions/q-/qt5-base.json
* Update ports/qt5-base/portfile.cmake
* Update versions/q-/qt5-base.json
* Update versions/q-/qt5-base.json
* update version record
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
| -rw-r--r-- | ports/qt5-base/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/qt5-base/vcpkg.json | 10 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/q-/qt5-base.json | 5 |
4 files changed, 19 insertions, 3 deletions
diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 5137f72d0..0d61fd06f 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -147,6 +147,11 @@ else() list(APPEND CORE_OPTIONS -no-sql-mysql) endif() +if ("vulkan" IN_LIST FEATURES) + list(APPEND CORE_OPTIONS --vulkan=yes) +else() + list(APPEND CORE_OPTIONS --vulkan=no) +endif() find_library(ZLIB_RELEASE NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ZLIB_DEBUG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 7ff462eba..c2ba35dd0 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", - "version-string": "5.15.2", - "port-version": 5, + "version-semver": "5.15.2", + "port-version": 6, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ @@ -48,6 +48,12 @@ "dependencies": [ "libpq" ] + }, + "vulkan": { + "description": "Enable Vulkan support in QtGui", + "dependencies": [ + "vulkan" + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 1861c3eed..b026addc4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4990,7 +4990,7 @@ }, "qt5-base": { "baseline": "5.15.2", - "port-version": 5 + "port-version": 6 }, "qt5-canvas3d": { "baseline": "0", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 806f5b7a7..78b2776d2 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "96a7bf2a451b16e43b7adda9d0be8f07d853a090", + "version-semver": "5.15.2", + "port-version": 6 + }, + { "git-tree": "971d4936dfb79384d61cdafc9775b7caa2329135", "version-string": "5.15.2", "port-version": 5 |