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/platformsupport/eglconvenience | |
| 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/platformsupport/eglconvenience')
| -rw-r--r-- | src/platformsupport/eglconvenience/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/platformsupport/eglconvenience/CMakeLists.txt b/src/platformsupport/eglconvenience/CMakeLists.txt index 2b20a9cb35..af5d277f7a 100644 --- a/src/platformsupport/eglconvenience/CMakeLists.txt +++ b/src/platformsupport/eglconvenience/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from eglconvenience.pro. -find_package(OpenGL) +find_package(EGL) ##################################################################### ## EglSupport Module: @@ -18,8 +18,12 @@ add_qt_module(EglSupport LIBRARIES Qt::CorePrivate Qt::GuiPrivate - OpenGL::EGL + EGL::EGL ${CMAKE_DL_LIBS} + # CONFIG = "static" "internal_module" "egl" + # MODULE = "egl_support" + # PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h" + # _LOADED = "qt_module" ) ## Scopes: |