diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-14 09:37:29 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-14 15:03:13 +0200 |
| commit | 82ff8a51f9d00ba251e6307ef6e6c36794947852 (patch) | |
| tree | cb8a8160c47354d4a84e2162d4ac7c61a5a5ce71 /src/gui/configure.cmake | |
| parent | b9c493728aa9f73b6876c6bef0ebd9f07824f553 (diff) | |
Revert "Revert "CMake: Make the Vulkan dependency of QtGui optional""
This reverts commit f0873a1c62cb880b2586ebda0f40e69c930c1cec.
The build failure caused by 58c1c6ee5c986d502b56eb1cc57f1d9444d42031 has
been fixed.
Change-Id: I5cec78b353089ca024e905795bc99cad423c2d4e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/gui/configure.cmake')
| -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() |