forked from bartvdbraak/blender
Cycles: fix GLEW library build issue.
This commit is contained in:
parent
4bb582effb
commit
7e4ba190cb
@ -18,7 +18,7 @@ SET(LIBRARIES
|
||||
cycles_util
|
||||
${Boost_LIBRARIES}
|
||||
${OPENGL_LIBRARIES}
|
||||
${GLEW_LIBRARY}
|
||||
${CYCLES_GLEW_LIBRARY}
|
||||
${OPENIMAGEIO_LIBRARY})
|
||||
|
||||
IF(WITH_CYCLES_TEST)
|
||||
|
@ -43,7 +43,7 @@ SET(LIBRARIES
|
||||
${OPENGL_LIBRARIES}
|
||||
${OPENIMAGEIO_LIBRARY}
|
||||
${GLUT_LIBRARIES}
|
||||
${GLEW_LIBRARIES}
|
||||
${CYCLES_GLEW_LIBRARY}
|
||||
${BLENDER_LIBRARIES})
|
||||
|
||||
IF(WITH_CYCLES_OSL)
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user