CMake: Fixes for OpenGL library preferences
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 14 Dec 2018 13:48:05 +0000 (14:48 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 14 Dec 2018 13:48:05 +0000 (14:48 +0100)
Prefer legacy OpenGL library, for the compatibility and portability
reasons.

Also use proper OpenGL libraries to be linked against, so we can
change preference to GLVND.

CMakeLists.txt

index 1912b8f6a3452bfc4217d40ad7e03f05ee25ed60..02a35c1cd4c935b3f1fb191985f6b75e37ed5dbc 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()
@@ -1042,7 +1049,7 @@ if(WITH_SYSTEM_GLES)
 endif()
 
 if(WITH_GL_PROFILE_COMPAT OR WITH_GL_PROFILE_CORE)
-       list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_gl_LIBRARY}")
+       list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_LIBRARIES}")
 
 elseif(WITH_GL_PROFILE_ES20)
        if(WITH_SYSTEM_GLES)