diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-10 10:46:06 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-12 19:27:01 +0200 |
commit | 16aa8c8f4d83f2e2aaa04e6dd0e7c6dc7f854d9d (patch) | |
tree | 5c59b462c1dca15a2bd68aa16660a122e9b5705c /src/gui | |
parent | 3685483c4b79b4075bab6d341174a395359d1b4a (diff) |
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 <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/configure.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
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() |