From 16aa8c8f4d83f2e2aaa04e6dd0e7c6dc7f854d9d Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 10 Sep 2020 10:46:06 +0200 Subject: CMake: Make the Vulkan dependency of QtGui optional Vulkan cannot be a required public dependency of QtGui, because a vulkan-enabled build of Qt will fail on a machine where the vulkan headers are not installed. We cannot make the vulkan dependency private, because we have public Qt headers that include vulkan headers. The vulkan dependency is now marked as optional, meaning consuming projects will try to find it, but there will be no error on failure. Task-number: QTBUG-86421 Change-Id: I30edfd3eaa603048f4274e77036c54d90789d3c9 Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor --- src/gui/configure.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gui/configure.cmake') diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 81f4af598f..a58ce7c982 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -49,7 +49,7 @@ qt_find_package(Mtdev PROVIDED_TARGETS PkgConfig::Mtdev MODULE_NAME gui QMAKE_LI qt_find_package(WrapOpenGL PROVIDED_TARGETS WrapOpenGL::WrapOpenGL MODULE_NAME gui QMAKE_LIB opengl) qt_find_package(GLESv2 PROVIDED_TARGETS GLESv2::GLESv2 MODULE_NAME gui QMAKE_LIB opengl_es2) qt_find_package(Tslib PROVIDED_TARGETS PkgConfig::Tslib MODULE_NAME gui QMAKE_LIB tslib) -qt_find_package(Vulkan PROVIDED_TARGETS Vulkan::Vulkan MODULE_NAME gui QMAKE_LIB vulkan) +qt_find_package(Vulkan PROVIDED_TARGETS Vulkan::Vulkan MODULE_NAME gui QMAKE_LIB vulkan MARK_OPTIONAL) # special case if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS) qt_find_package(Wayland PROVIDED_TARGETS Wayland::Server MODULE_NAME gui QMAKE_LIB wayland_server) endif() -- cgit v1.2.3