diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-06-30 12:37:14 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-01 21:22:36 +0000 |
| commit | 3145bd1af7b68d320a0ab1bdf73eeeafa8caf3d4 (patch) | |
| tree | 505ffcf12494e29d47192428b9ac6fd2e375c140 /util | |
| parent | a7b6b6dbe9f8441b2c0caee2c51f921564acd4a8 (diff) | |
CMake: Fix Vulkan to be found when targeting Android
Introduce two new packages WrapVulkanHeaders and WrapVulkan similar to
the OpenSSL wrapper packages.
WrapVulkanHeaders uses FindVulkan and is marked as found if Vulkan
headers are found (that's the only part the Qt build requires).
The WrapVulkan package is currently not used, but is there for
symmetry.
The Vulkan feature is now disabled by default on QNX, because the
QNX toolchain file in the CI does not set
CMAKE_FIND_ROOT_PATH_MODE-like variables and CMake ends up finding
host Vulkan headers causing the build to break.
Fixes: QTBUG-92157
Change-Id: I05309821f866456cd42e7f85bf8b76ba099df656
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit bb25536a3db657b41ae31e1690d230ef8722b57d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/cmake/helper.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 17725e325a..298e7cbf68 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -500,7 +500,7 @@ _library_map = [ LibraryMapping("tslib", "Tslib", "PkgConfig::Tslib"), LibraryMapping("udev", "Libudev", "PkgConfig::Libudev"), LibraryMapping("udev", "Libudev", "PkgConfig::Libudev"), # see also libudev! - LibraryMapping("vulkan", "Vulkan", "Vulkan::Vulkan"), + LibraryMapping("vulkan", "WrapVulkanHeaders", "WrapVulkanHeaders::WrapVulkanHeaders"), LibraryMapping("wayland_server", "Wayland", "Wayland::Server"), # used in qtbase/src/gui LibraryMapping("wayland-server", "Wayland", "Wayland::Server"), # used in qtwayland LibraryMapping("wayland-client", "Wayland", "Wayland::Client"), |