gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve OpenGL detection checks in CMake (#14443)

Browse Source 
The OpenGL headers are not always implicitly available, so this improves the check by calling `find_package` and using the `OPENGL_INCLUDE_DIRS` or `OPENGL_INCLUDE_DIR` var for the `check_c_source_compiles` test.
The minimum CMake version currently set is 3.16, `OPENGL_INCLUDE_DIRS` was only added in 3.29, so the code is set to choose `OPENGL_INCLUDE_DIRS` if it exists. If the minimum CMake version is ever set to >= 3.29 this check can be removed and just the `OPENGL_INCLUDE_DIRS` variable can be chosen.
This commit is contained in:
Donovan Maas
2025-11-14 02:18:33 -06:00
committed by GitHub
parent 9fd3dbfc42
commit 879f081de3
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmake/sdlchecks.cmake
View File

@@ -800,13 +800,29 @@ macro(CheckOpenVR)
endif() endif()
endmacro() endmacro()
# Requires
# - N/A
macro(FindOpenGLHeaders)
find_package(OpenGL MODULE)
# OPENGL_INCLUDE_DIRS is preferred over OPENGL_INCLUDE_DIR, but was only added in 3.29,
# If the CMake minimum version is changed to be >= 3.29, the second check should be removed.
if(OPENGL_INCLUDE_DIRS)
list(APPEND CMAKE_REQUIRED_INCLUDES ${OPENGL_INCLUDE_DIRS})
elseif(OPENGL_INCLUDE_DIR)
list(APPEND CMAKE_REQUIRED_INCLUDES ${OPENGL_INCLUDE_DIR})
endif()
endmacro()
# Requires: # Requires:
# - nada # - nada
macro(CheckGLX) macro(CheckGLX)
if(SDL_OPENGL) if(SDL_OPENGL)
cmake_push_check_state()
FindOpenGLHeaders()
check_c_source_compiles(" check_c_source_compiles("
#include <GL/glx.h> #include <GL/glx.h>
int main(int argc, char** argv) { return 0; }" HAVE_OPENGL_GLX) int main(int argc, char** argv) { return 0; }" HAVE_OPENGL_GLX)
cmake_pop_check_state()
if(HAVE_OPENGL_GLX AND NOT HAVE_ROCKCHIP) if(HAVE_OPENGL_GLX AND NOT HAVE_ROCKCHIP)
set(SDL_VIDEO_OPENGL_GLX 1) set(SDL_VIDEO_OPENGL_GLX 1)
endif() endif()
@@ -840,10 +856,13 @@ endmacro()
# - nada # - nada
macro(CheckOpenGL) macro(CheckOpenGL)
if(SDL_OPENGL) if(SDL_OPENGL)
cmake_push_check_state()
FindOpenGLHeaders()
check_c_source_compiles(" check_c_source_compiles("
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glext.h> #include <GL/glext.h>
int main(int argc, char** argv) { return 0; }" HAVE_OPENGL) int main(int argc, char** argv) { return 0; }" HAVE_OPENGL)
cmake_pop_check_state()
if(HAVE_OPENGL) if(HAVE_OPENGL)
set(SDL_VIDEO_OPENGL 1) set(SDL_VIDEO_OPENGL 1)
set(SDL_VIDEO_RENDER_OGL 1) set(SDL_VIDEO_RENDER_OGL 1)
@@ -856,6 +875,7 @@ endmacro()
macro(CheckOpenGLES) macro(CheckOpenGLES)
if(SDL_OPENGLES) if(SDL_OPENGLES)
cmake_push_check_state() cmake_push_check_state()
FindOpenGLHeaders()
list(APPEND CMAKE_REQUIRED_INCLUDES "${SDL3_SOURCE_DIR}/src/video/khronos") list(APPEND CMAKE_REQUIRED_INCLUDES "${SDL3_SOURCE_DIR}/src/video/khronos")
check_c_source_compiles(" check_c_source_compiles("
#include <GLES/gl.h> #include <GLES/gl.h>