[Bf-blender-cvs] [605f08c043d] x11-egl: GHOST/X11: don't link GLX when using EGL
Christian Rauch
noreply at git.blender.org
Mon Aug 9 21:53:31 CEST 2021
Commit: 605f08c043da94c99e1bf2ec4f00a79dd4498b92
Author: Christian Rauch
Date: Sun Aug 8 18:34:34 2021 +0100
Branches: x11-egl
https://developer.blender.org/rB605f08c043da94c99e1bf2ec4f00a79dd4498b92
GHOST/X11: don't link GLX when using EGL
Differential Revision: https://developer.blender.org/D12034
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac5c80cb0d8..ae2d4b1c8cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1179,11 +1179,11 @@ if(WITH_GL_PROFILE_ES20)
endif()
-else()
+elseif(NOT WITH_GL_EGL)
if(OpenGL_GL_PREFERENCE STREQUAL "LEGACY" AND OPENGL_gl_LIBRARY)
list(APPEND BLENDER_GL_LIBRARIES ${OPENGL_gl_LIBRARY})
else()
- list(APPEND BLENDER_GL_LIBRARIES ${OPENGL_opengl_LIBRARY} ${OPENGL_glx_LIBRARY})
+ list(APPEND BLENDER_GL_LIBRARIES OpenGL::OpenGL OpenGL::GLX)
endif()
endif()
More information about the Bf-blender-cvs
mailing list