From 7e4ba190cb976cd7a8278a2974bae328de6f2f17 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 27 May 2011 12:13:10 +0000 Subject: Cycles: fix GLEW library build issue. --- intern/cycles/cmake/external_libs.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'intern/cycles/cmake') diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index cfd997a6469..fbda3ac2e34 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -62,6 +62,12 @@ IF(WITH_CYCLES_TEST) INCLUDE_DIRECTORIES(${GLUT_INCLUDE_DIR}) ENDIF() +IF(WITH_BUILTIN_GLEW) + SET(CYCLES_GLEW_LIBRARY extern_glew) +ELSE() + SET(CYCLES_GLEW_LIBRARY ${GLEW_LIBRARY}) +ENDIF() + ########################################################################### # OpenShadingLanguage @@ -165,12 +171,12 @@ IF(WITH_CYCLES_OPENCL) IF(WIN32) SET(OPENCL_INCLUDES "") - SET(OPENCL_LIRBARIES "OpenCL") + SET(OPENCL_LIBRARIES "OpenCL") ENDIF() IF(UNIX AND NOT APPLE) SET(OPENCL_INCLUDES ${CYCLES_OPENCL}) - SET(OPENCL_LIRBARIES "OpenCL") + SET(OPENCL_LIBRARIES "OpenCL") ENDIF() ADD_DEFINITIONS(-DWITH_OPENCL) -- cgit v1.2.3