[Bf-blender-cvs] [13cfd0f] soc-2014-viewport_context: Fix for building with system glew

Campbell Barton noreply at git.blender.org
Mon Jul 28 20:00:42 CEST 2014


Commit: 13cfd0f60796934539dd0c7a5c46f5c31c84575b
Author: Campbell Barton
Date:   Tue Jul 29 04:00:22 2014 +1000
Branches: soc-2014-viewport_context
https://developer.blender.org/rB13cfd0f60796934539dd0c7a5c46f5c31c84575b

Fix for building with system glew

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 937678d..b63129b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2230,7 +2230,11 @@ if(WITH_SYSTEM_GLEW)
 		message(FATAL_ERROR "GLEW is required to build Blender. Install it or disable WITH_SYSTEM_GLEW.")
 	endif()
 
-	set(BLENDER_GLEW_LIBRARIES ${GLEW_LIBRARY})
+	if(WITH_GLEW_MX)
+		set(BLENDER_GLEW_LIBRARIES ${GLEW_MX_LIBRARY})
+	else()
+		set(BLENDER_GLEW_LIBRARIES ${GLEW_LIBRARY})
+	endif()
 else()
 	if(WITH_GLEW_ES)
 		set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew-es/include")




More information about the Bf-blender-cvs mailing list