[Bf-blender-cvs] [3ae2dc4] soc-2014-viewport_fx: The GLU library in BLENDER_GL_LIBRARIES was accidentally being replaced. Solution is to use list(APPEND) instead of set().
Jason Wilkins
noreply at git.blender.org
Wed Jun 25 23:42:38 CEST 2014
Commit: 3ae2dc47e7ef253467c3f79dbabb531b9e934b54
Author: Jason Wilkins
Date: Wed Jun 25 08:59:35 2014 -0500
https://developer.blender.org/rB3ae2dc47e7ef253467c3f79dbabb531b9e934b54
The GLU library in BLENDER_GL_LIBRARIES was accidentally being replaced. Solution is to use list(APPEND) instead of set().
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a499e9..d21df76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2059,14 +2059,14 @@ if(WITH_GLU)
endif()
if(WITH_GL_CONTEXT_DESKTOP)
- set(BLENDER_GL_LIBRARIES "${OPENGL_gl_LIBRARY}")
+ list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_gl_LIBRARY}")
elseif(WITH_GL_CONTEXT_EMBEDDED)
if(WITH_SYSTEM_GLES)
find_package_wrapper(OpenGLES)
if(OPENGLES_FOUND)
- set(BLENDER_GL_LIBRARIES OPENGLES_LIBRARIES)
+ list(APPEND BLENDER_GL_LIBRARIES OPENGLES_LIBRARIES)
else()
message(FATAL_ERROR "Unable to find OpenGL ES libraries. Install them or disable WITH_SYSTEM_GLES.")
endif()
More information about the Bf-blender-cvs
mailing list