Make OpenGL preference configurable, default to LEGACY (#7666)

This partially reverts 1ec5028
Add option OPENGL_GL_PREFERENCE

diff --git a/README.md b/README.md
index 1cc6e91a62e766e4ff20643530876ae529b3821f..97cf7e8a4868ac27bd4656835d4c4ef75d70510e 100644 (file)
--- 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 dbb9e5c6a9ab638d1e6af3e0afc0aa0a91a4d90c..05446c08400a502fb6f65af123410efa2d351832 100644 (file)
--- 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)