diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-02-11 16:58:26 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-02-12 14:57:30 +0000 |
| commit | 519ef817ffb4dbadb00ac958e7402cbfeaf135af (patch) | |
| tree | 1a3dd3891011fb0b433a5b1f6c880e3751b36dde /src/plugins/platforms/minimalegl | |
| parent | 6424e70bbef492f052d1aa6b7ce36d5326625e6e (diff) | |
Fix Desktop GL/EGL/GLESv2 linkage
This change fixes a few things in one go:
* cmake's FindOpenGL cannot be used reliably to detect EGL. So use a
custom module for that.
* Added a custom module for GLESv2 detection, as cmake's FindOpenGL
does not support that.
* Map CONFIG += opengl to a WrapOpenGL target, which links against
either GLESv2 or libGL - just like mkspecs/features/*/opengl.prf
* cmake's FindOpenGL remains in use solely to detect the availability
of desktop gl.
Change-Id: I9315e5ad1fd88e1b7dc7e920053e98fb51fea7fc
Reviewed-by: Volker Krause <volker.krause@kdab.com>
Diffstat (limited to 'src/plugins/platforms/minimalegl')
| -rw-r--r-- | src/plugins/platforms/minimalegl/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt index a038d07df9..f6d46c55a4 100644 --- a/src/plugins/platforms/minimalegl/CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/CMakeLists.txt @@ -1,5 +1,7 @@ # Generated from minimalegl.pro. +find_package(FindWrapOpenGL) + ##################################################################### ## qminimalegl Plugin: ##################################################################### @@ -19,6 +21,7 @@ add_qt_plugin(qminimalegl Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate Qt::EglSupportPrivate + WrapOpenGL # CONFIG = "egl" # OTHER_FILES = "minimalegl.json" # PLUGIN_CLASS_NAME = "QMinimalEglIntegrationPlugin" |