diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-05-03 10:15:34 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-05-03 08:27:51 +0000 |
| commit | c2379c469cb464df7c4ab78eb65e32f795ed050e (patch) | |
| tree | fea62824823377cf434027a1e0ca15088a307dbb | |
| parent | 64b31cafa102c788a25a3d83975da84938a7432b (diff) | |
Fix linking on systems where there's no libGLX.so but mesa provides bindings
Behave like qmake and link against libGL simply. This happened in
offscreen.pro implicitly through QT += gui-private and needs to happen
explicitly here by using the CONFIG += opengl equivalent: WrapOpenGL.
Change-Id: I396c2256c89f4560bb7f936f7540b33c754b9eda
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | src/platformsupport/glxconvenience/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/platformsupport/glxconvenience/CMakeLists.txt b/src/platformsupport/glxconvenience/CMakeLists.txt index 8480a35125..729f494558 100644 --- a/src/platformsupport/glxconvenience/CMakeLists.txt +++ b/src/platformsupport/glxconvenience/CMakeLists.txt @@ -1,5 +1,5 @@ qt_find_package(X11) # special case -qt_find_package(OpenGL) # special case +qt_find_package(WrapOpenGL PROVIDED_TARGETS WrapOpenGL) # special case ##################################################################### ## GlxSupport Module: @@ -12,7 +12,7 @@ add_qt_module(GlxSupport DEFINES QT_NO_CAST_FROM_ASCII LIBRARIES - OpenGL::GLX # special case + WrapOpenGL # special case Qt::CorePrivate Qt::GuiPrivate X11::X11 # special case |