diff options
| author | SmallJoker <SmallJoker@users.noreply.github.com> | 2018-09-22 20:54:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-22 20:54:43 +0200 |
| commit | 785f68ef3366e93c17f190535ba5604896fcf21c (patch) | |
| tree | 791537f3023b546702c6fb7561e9d1cd165a5b6e | |
| parent | 79e393cf4b5027eb9071df23f4834aac3f3a689f (diff) | |
| download | minetest-785f68ef3366e93c17f190535ba5604896fcf21c.tar.gz minetest-785f68ef3366e93c17f190535ba5604896fcf21c.tar.bz2 minetest-785f68ef3366e93c17f190535ba5604896fcf21c.zip | |
Make OpenGL preference configurable, default to LEGACY (#7666)
This partially reverts 1ec5028
Add option OPENGL_GL_PREFERENCE
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 6 |
2 files changed, 6 insertions, 1 deletions
@@ -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) |