diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2020-08-18 16:42:51 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2020-08-20 14:41:49 +0200 |
| commit | c4d3e5d7d31d4cd2bfec35ba8c86aeb7329288b7 (patch) | |
| tree | 7a94935a85bcfddc5d4a0fdfb37a32cf61629382 /cmake | |
| parent | 73277763c15c6117c14d60ac9c030d7618fa59e8 (diff) | |
| download | qtbase-c4d3e5d7d31d4cd2bfec35ba8c86aeb7329288b7.tar.gz | |
CMake Build: Use EGL library as dependency for GLESv2
On QNX the feature detection of GLESv2 is failing due to missing
symbols which are part of EGL library.
Add EGL library as a dependency if it's found on the system.
This allows OpenGL ES feature detection to work on QNX.
Task-number: QTBUG-83202
Change-Id: I90531d925fadce5d893ea9244793fc02a4595ed1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindGLESv2.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cmake/FindGLESv2.cmake b/cmake/FindGLESv2.cmake index e934170196..8e2bc6959f 100644 --- a/cmake/FindGLESv2.cmake +++ b/cmake/FindGLESv2.cmake @@ -7,8 +7,12 @@ if(EMSCRIPTEN) else() find_library(GLESv2_LIBRARY NAMES GLESv2 OpenGLES) find_path(GLESv2_INCLUDE_DIR NAMES "GLES2/gl2.h" "OpenGLES/ES2/gl.h" DOC "The OpenGLES 2 include path") + find_package(EGL) set(_libraries "${CMAKE_REQUIRED_LIBRARIES}") list(APPEND CMAKE_REQUIRED_LIBRARIES "${GLESv2_LIBRARY}") + if(EGL_LIBRARY) + list(APPEND CMAKE_REQUIRED_LIBRARIES "${EGL_LIBRARY}") + endif() set(_includes "${CMAKE_REQUIRED_INCLUDES}") list(APPEND CMAKE_REQUIRED_INCLUDES "${GLESv2_INCLUDE_DIR}") @@ -67,5 +71,9 @@ if(GLESv2_FOUND AND NOT TARGET GLESv2::GLESv2) set_target_properties(GLESv2::GLESv2 PROPERTIES IMPORTED_LOCATION "${GLESv2_LIBRARY}" INTERFACE_INCLUDE_DIRECTORIES "${GLESv2_INCLUDE_DIR}") + + if(EGL_LIBRARY) + target_link_libraries(GLESv2::GLESv2 INTERFACE "${EGL_LIBRARY}") + endif() endif() endif() |