Commit: 1ead782e3c1a37112824674135ae3ad76298821d
Author: Jason Wilkins
Date: Tue Jul 1 02:49:38 2014 -0500
https://developer.blender.org/rB1ead782e3c1a37112824674135ae3ad76298821d
Merge branch 'master' of git.blender.org:blender into soc-2014-viewport_fx
===================================================================
===================================================================
diff --cc intern/cycles/cmake/external_libs.cmake
index 6cc9cef,bb174d6..cb1ae52
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
@@@ -7,18 -8,16 +7,21 @@@ if(WITH_CYCLES_STANDALONE AND WITH_CYCL
find_package(GLUT)
message(STATUS "GLUT_FOUND=${GLUT_FOUND}")
- include_directories(${GLUT_INCLUDE_DIR})
+ include_directories(
+ SYSTEM
+ ${GLUT_INCLUDE_DIR}
+ )
endif()
-if(WITH_SYSTEM_GLEW)
- set(CYCLES_GLEW_LIBRARY ${GLEW_LIBRARY})
-else()
- set(CYCLES_GLEW_LIBRARY extern_glew)
+###########################################################################
+# 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()
endif()
###########################################################################
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
