From 510976f13056422ff0f90a6870772f57f03b26a9 Mon Sep 17 00:00:00 2001 From: JosiahWI <41302989+JosiahWI@users.noreply.github.com> Date: Sun, 14 May 2023 13:54:03 -0500 Subject: [PATCH] Prefer GLVND at CMake>=3.11 CMake 3.10 introduced GLVND support. CMake 3.11 introduced CMP0072, which prefers GLVND when NEW behavior is set. I set default policies to 3.11 for CMake versions >=3.11 and did not bother with requesting GLVND for CMake 3.10. --- CMakeLists.txt | 6 +++--- source/Irrlicht/CMakeLists.txt | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c289434..919c3c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -# Set policies up to 3.9 since we want to enable the IPO option -if(${CMAKE_VERSION} VERSION_LESS 3.9) +# >=3.9 enables IPO; >=3.11 prefers GLVND +if(${CMAKE_VERSION} VERSION_LESS 3.11) cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}) else() - cmake_policy(VERSION 3.9) + cmake_policy(VERSION 3.11) endif() set(IRRLICHTMT_REVISION 11) diff --git a/source/Irrlicht/CMakeLists.txt b/source/Irrlicht/CMakeLists.txt index 2ddd04c..90c4299 100644 --- a/source/Irrlicht/CMakeLists.txt +++ b/source/Irrlicht/CMakeLists.txt @@ -261,7 +261,6 @@ if(ENABLE_GLES2) find_package(OpenGLES2 REQUIRED) endif() if(ENABLE_OPENGL OR ENABLE_OPENGL3) - set(OpenGL_GL_PREFERENCE "LEGACY") find_package(OpenGL REQUIRED) endif() if(USE_SDL2)