Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-05-27 16:13:10 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-05-27 16:13:10 +0400
commit7e4ba190cb976cd7a8278a2974bae328de6f2f17 (patch)
tree0b22fc00f1ce08bb5f3edf8f312bb78100fec1e0 /intern/cycles/cmake
parent4bb582effb23597ec819624c02f8ae516888a35e (diff)
Cycles: fix GLEW library build issue.
Diffstat (limited to 'intern/cycles/cmake')
-rw-r--r--intern/cycles/cmake/external_libs.cmake10
1 files changed, 8 insertions, 2 deletions
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)