Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-01-03 19:42:04 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-01-03 19:43:07 +0300
commit255ab75eb3af6e1e56e68c5abf09970a59d980e5 (patch)
treedcf91ccaadfa885f6aa605c3b8e3a8d4be26c87b /CMakeLists.txt
parent3c411f5ba1d46b34a7812d9d6101481338a19aec (diff)
Don't link against GLU library
We are core profile now, no need to link against GLU. This change makes it so Blender binary is not dependent on liGLU.so. That was a weird thing that Blender was dependent on it, but was not using any functions from it.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3218bf9ba4b..8d8f78a3e7a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1057,8 +1057,11 @@ if(WITH_GL_PROFILE_ES20)
endif()
else()
- list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_LIBRARIES}")
-
+ if(OpenGL_GL_PREFERENCE STREQUAL "LEGACY" AND OPENGL_gl_LIBRARY)
+ list(APPEND BLENDER_GL_LIBRARIES ${OPENGL_gl_LIBRARY} ${OPENGL_glx_LIBRARY})
+ else()
+ list(APPEND BLENDER_GL_LIBRARIES ${OPENGL_opengl_LIBRARY} ${OPENGL_glx_LIBRARY})
+ endif()
endif()
if(WITH_GL_EGL)