[Bf-blender-cvs] [0658d047a94] master: CMake: Fixes for OpenGL library preferences

Sergey Sharybin noreply at git.blender.org
Fri Dec 14 14:50:00 CET 2018


Commit: 0658d047a94a86060f039790898a80a7adb0dcd9
Author: Sergey Sharybin
Date:   Fri Dec 14 14:48:05 2018 +0100
Branches: master
https://developer.blender.org/rB0658d047a94a86060f039790898a80a7adb0dcd9

CMake: Fixes for OpenGL library preferences

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.

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1912b8f6a34..02a35c1cd4c 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()
@@ -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)



More information about the Bf-blender-cvs mailing list