From 785f68ef3366e93c17f190535ba5604896fcf21c Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Sat, 22 Sep 2018 20:54:43 +0200 Subject: [PATCH] Make OpenGL preference configurable, default to LEGACY (#7666) This partially reverts 1ec5028 Add option OPENGL_GL_PREFERENCE --- README.md | 1 + src/CMakeLists.txt | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1cc6e91a6..97cf7e8a4 100644 --- a/README.md +++ b/README.md @@ -212,6 +212,7 @@ General options and their default values: ENABLE_LUAJIT=ON - Build with LuaJIT (much faster than non-JIT Lua) ENABLE_SYSTEM_GMP=ON - Use GMP from system (much faster than bundled mini-gmp) ENABLE_SYSTEM_JSONCPP=OFF - Use JsonCPP from system + OPENGL_GL_PREFERENCE=LEGACY - Linux client build only; See CMake Policy CMP0072 for reference RUN_IN_PLACE=FALSE - Create a portable install (worlds, settings etc. in current directory) USE_GPROF=FALSE - Enable profiling using GProf VERSION_EXTRA= - Text to append to version (e.g. VERSION_EXTRA=foobar -> Minetest 0.4.9-foobar) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dbb9e5c6a..05446c084 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -296,7 +296,11 @@ else() if(NOT HAIKU) find_package(X11 REQUIRED) endif(NOT HAIKU) - set(OpenGL_GL_PREFERENCE "GLVND") + + set(OPENGL_GL_PREFERENCE "LEGACY" CACHE STRING + "See CMake Policy CMP0072 for reference. GLVND is broken on some nvidia setups") + set(OpenGL_GL_PREFERENCE ${OPENGL_GL_PREFERENCE}) + find_package(OpenGL REQUIRED) find_package(JPEG REQUIRED) find_package(BZip2 REQUIRED)