From bb25536a3db657b41ae31e1690d230ef8722b57d Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 30 Jun 2021 12:37:14 +0200 Subject: 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. Pick-to: 6.2 Fixes: QTBUG-92157 Change-Id: I05309821f866456cd42e7f85bf8b76ba099df656 Reviewed-by: Alexey Edelev Reviewed-by: Assam Boudjelthia Reviewed-by: Alexandru Croitor --- src/opengl/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/opengl') diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt index 1d92e89998..11345b5dc1 100644 --- a/src/opengl/CMakeLists.txt +++ b/src/opengl/CMakeLists.txt @@ -91,7 +91,7 @@ qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_vulkan SOURCES qvkconvenience.cpp qvkconvenience_p.h PUBLIC_LIBRARIES - Vulkan::Vulkan_nolink + WrapVulkanHeaders::WrapVulkanHeaders ) qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_egl -- cgit v1.2.3