diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-14 16:50:47 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-14 16:50:47 +0300 |
| commit | e54182427a41d54a900deac5b55b09a2407e31f6 (patch) | |
| tree | bc8acafc20bb300f8e61b05fcdb8d64dcbb3dbb4 /CMakeLists.txt | |
| parent | 9d4ab3fe58ab1fe8658bb006d6c9596fbf498359 (diff) | |
| parent | 0658d047a94a86060f039790898a80a7adb0dcd9 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c40eb5bb2a0..3218bf9ba4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,6 +47,13 @@ endif() cmake_minimum_required(VERSION 3.5) +# Prever LEGACY OpenGL to eb compatible with all the existing releases and +# platforms which don't hare GLVND yet. Only do it if preference was not set +# externally. +if(NOT DEFINED OpenGL_GL_PREFERENCE) + set(OpenGL_GL_PREFERENCE "LEGACY") +endif() + if(NOT EXECUTABLE_OUTPUT_PATH) set(FIRST_RUN TRUE) else() @@ -1050,7 +1057,7 @@ if(WITH_GL_PROFILE_ES20) endif() else() - list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_gl_LIBRARY}") + list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_LIBRARIES}") endif() |