1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake Build: Use EGL library as dependency for GLESv2

Browse Source 
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>
This commit is contained in:
Cristian Adam 2020-08-18 16:42:51 +02:00
parent 73277763c1
commit c4d3e5d7d3
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/FindGLESv2.cmake
View File

@ -7,8 +7,12 @@ if(EMSCRIPTEN)
else() else()
find_library(GLESv2_LIBRARY NAMES GLESv2 OpenGLES) 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_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}") set(_libraries "${CMAKE_REQUIRED_LIBRARIES}")
list(APPEND CMAKE_REQUIRED_LIBRARIES "${GLESv2_LIBRARY}") list(APPEND CMAKE_REQUIRED_LIBRARIES "${GLESv2_LIBRARY}")
if(EGL_LIBRARY)
list(APPEND CMAKE_REQUIRED_LIBRARIES "${EGL_LIBRARY}")
endif()
set(_includes "${CMAKE_REQUIRED_INCLUDES}") set(_includes "${CMAKE_REQUIRED_INCLUDES}")
list(APPEND CMAKE_REQUIRED_INCLUDES "${GLESv2_INCLUDE_DIR}") 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 set_target_properties(GLESv2::GLESv2 PROPERTIES
IMPORTED_LOCATION "${GLESv2_LIBRARY}" IMPORTED_LOCATION "${GLESv2_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${GLESv2_INCLUDE_DIR}") INTERFACE_INCLUDE_DIRECTORIES "${GLESv2_INCLUDE_DIR}")
if(EGL_LIBRARY)
target_link_libraries(GLESv2::GLESv2 INTERFACE "${EGL_LIBRARY}")
endif()
endif() endif()
endif() endif()