diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2019-05-02 17:23:29 +0300 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-05-02 14:56:32 +0000 |
| commit | 1361cf5d50e0baa901c06cab7f87785a03c57cb7 (patch) | |
| tree | 37fdfb341e97146af11b5a61a578731e29e22700 /src | |
| parent | ef3e37b9a334ee91a84aabd3a1b2c5cdfe3c7abe (diff) | |
CMake: better GLX detection
Change-Id: I71dfbb331cb02a3249b0c3c65f2a9bd9ce68c739
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/platformsupport/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/offscreen/CMakeLists.txt | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt index ece4eed2aa..cac0b21782 100644 --- a/src/platformsupport/CMakeLists.txt +++ b/src/platformsupport/CMakeLists.txt @@ -44,7 +44,7 @@ if(QT_FEATURE_opengl) add_subdirectory(platformcompositor) endif() -if (QT_FEATURE_xlib AND QT_FEATURE_opengl AND (NOT QT_FEATURE_opengles2)) +if (QT_FEATURE_xlib AND QT_FEATURE_opengl AND TARGET OpenGL::GLX) # special case add_subdirectory(glxconvenience) endif() diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt index 3546f8710b..513bc0a6be 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -33,7 +33,7 @@ add_qt_plugin(qoffscreen ## Scopes: ##################################################################### -extend_target(qoffscreen CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 +extend_target(qoffscreen CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND TARGET OpenGL::GLX # special case SOURCES qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h LIBRARIES @@ -42,5 +42,9 @@ extend_target(qoffscreen CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT Qt::GlxSupport ) -#### Keys ignored in scope 3:.:.:./offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +extend_target(qoffscreen CONDITION NOT TARGET OpenGL::GLX OR NOT QT_FEATURE_opengl OR NOT QT_FEATURE_xlib # special case + SOURCES + qoffscreenintegration_dummy.cpp +) + # PLUGIN_EXTENDS = "-" |