AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow OpenGL to be found on X11-less Linux systems (using libOpenGL)

Browse Source 
Cmake supports finding OpenGL, even if there is no GLX (for glvnd) or
old-style libGL. This change keeps old behavior, but in case, if
X11-related OpenGL libraries cannot be found on Linux, it adds logic
to check for (and link with) libOpenGL, if it is present.

[ChangeLog][QtGui] Allow OpenGL to be found on X11-less Linux systems
(using libOpenGL)

Change-Id: Iccfeba83292a14081544c64ea8ce24fb52d1ee2f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Yaroslav Isakov 2023-07-08 22:09:40 +02:00
parent 87bfd33082
commit 929d9a4ca5
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/FindWrapOpenGL.cmake
View File

@ -46,6 +46,16 @@ if (OpenGL_FOUND)
else()
target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE OpenGL::GL)
endif()
elseif(UNIX AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "Integrity")
# Requesting only the OpenGL component ensures CMake does not mark the package as
# not found if neither GLX nor libGL are available. This allows finding OpenGL
# on an X11-less Linux system.
find_package(OpenGL ${WrapOpenGL_FIND_VERSION} COMPONENTS OpenGL)
if (OpenGL_FOUND)
set(WrapOpenGL_FOUND ON)
add_library(WrapOpenGL::WrapOpenGL INTERFACE IMPORTED)
target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE OpenGL::OpenGL)
endif()
endif()
include(FindPackageHandleStandardArgs)