Merge branch 'master' into blender2.8
[blender.git] / CMakeLists.txt
index c40eb5bb2a0ec51a09057efa2081549e00413298..3218bf9ba4bbb5532a4eab97ee90b7b8b5014d3e 100644 (file)
@@ -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()