[Bf-blender-cvs] [07c3d98] soc-2014-viewport_context: fixes linking problems with cycles standalone

Jason Wilkins noreply at git.blender.org
Thu Jul 31 12:14:55 CEST 2014


Commit: 07c3d981962ef17950f78961d7a504a99014d80b
Author: Jason Wilkins
Date:   Thu Jul 31 05:13:59 2014 -0500
Branches: soc-2014-viewport_context
https://developer.blender.org/rB07c3d981962ef17950f78961d7a504a99014d80b

fixes linking problems with cycles standalone

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

M	extern/CMakeLists.txt
M	intern/cycles/app/CMakeLists.txt
M	intern/cycles/cmake/external_libs.cmake

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

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 8c6c0ae..70671c9 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -47,14 +47,11 @@ if(WITH_BINRELOC)
 endif()
 
 if(NOT WITH_SYSTEM_GLEW)
-	if((NOT WITH_GLEW_ES) OR (WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI))
-		add_subdirectory(glew)
-	endif()
-
 	if(WITH_GLEW_ES)
 		add_subdirectory(glew-es)
+	else()
+		add_subdirectory(glew)
 	endif()
-
 endif()
 
 if(WITH_GAMEENGINE)
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index 875cd1a..8550214 100644
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -22,8 +22,8 @@ set(LIBRARIES
 	${BOOST_LIBRARIES}
 	${OPENEXR_LIBRARIES}
 	${OPENGL_LIBRARIES}
-	${CYCLES_APP_GLEW_LIBRARY}
 	bf_intern_glew_mx
+	${CYCLES_APP_GLEW_LIBRARY}
 	${OPENIMAGEIO_LIBRARIES}
 	${PNG_LIBRARIES}
 	${JPEG_LIBRARIES}
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake
index cb1ae52..4f02b93 100644
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
@@ -17,11 +17,7 @@ endif()
 # GLEW
 
 if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI)
-	if(WITH_SYSTEM_GLEW)
-		set(CYCLES_APP_GLEW_LIBRARY ${GLEW_LIBRARY})
-	else()
-		set(CYCLES_APP_GLEW_LIBRARY extern_glew) # Cycles Standalone should not use the experimental glew-es
-	endif()
+	set(CYCLES_APP_GLEW_LIBRARY ${BLENDER_GLEW_LIBRARIES})
 endif()
 
 ###########################################################################




More information about the Bf-blender-cvs mailing list