diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-09-13 12:15:53 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-13 12:20:50 +0200 |
| commit | f0873a1c62cb880b2586ebda0f40e69c930c1cec (patch) | |
| tree | aaa828884d091c690ac8d93116612456d76e81f7 /src/gui/configure.cmake | |
| parent | 652bd1efca34b7e114836f79c33b5e4a248faaee (diff) | |
Revert "CMake: Make the Vulkan dependency of QtGui optional"
The last 4 cmake changes broke configuring qtbase on at least
Volkers and my machine (Ubuntu 20.04)
Revert the changes, to unblock development of qtbase and
other modules.
This reverts commit 16aa8c8f4d83f2e2aaa04e6dd0e7c6dc7f854d9d.
Change-Id: Id562bdac1915dba429ae4a0af6054d3e5e5e5d12
Reviewed-by: Lars Knoll <lars.knoll@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 a58ce7c982..81f4af598f 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 MARK_OPTIONAL) # special case +qt_find_package(Vulkan PROVIDED_TARGETS Vulkan::Vulkan MODULE_NAME gui QMAKE_LIB vulkan) if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS) qt_find_package(Wayland PROVIDED_TARGETS Wayland::Server MODULE_NAME gui QMAKE_LIB wayland_server) endif() |