Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: fix GLEW library build issue.

Browse Source
This commit is contained in:
Brecht Van Lommel
2011-05-27 12:13:10 +00:00
parent 4bb582effb
commit 7e4ba190cb
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/app/CMakeLists.txt
View File

@@ -18,7 +18,7 @@ SET(LIBRARIES
cycles_util cycles_util
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${GLEW_LIBRARY} ${CYCLES_GLEW_LIBRARY}
${OPENIMAGEIO_LIBRARY}) ${OPENIMAGEIO_LIBRARY})
IF(WITH_CYCLES_TEST) IF(WITH_CYCLES_TEST)

2
intern/cycles/blender/CMakeLists.txt
View File

@@ -43,7 +43,7 @@ SET(LIBRARIES
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${OPENIMAGEIO_LIBRARY} ${OPENIMAGEIO_LIBRARY}
${GLUT_LIBRARIES} ${GLUT_LIBRARIES}
${GLEW_LIBRARIES} ${CYCLES_GLEW_LIBRARY}
${BLENDER_LIBRARIES}) ${BLENDER_LIBRARIES})
IF(WITH_CYCLES_OSL) IF(WITH_CYCLES_OSL)

10
intern/cycles/cmake/external_libs.cmake
View File

@@ -62,6 +62,12 @@ IF(WITH_CYCLES_TEST)
INCLUDE_DIRECTORIES(${GLUT_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${GLUT_INCLUDE_DIR})
ENDIF() ENDIF()
IF(WITH_BUILTIN_GLEW)
SET(CYCLES_GLEW_LIBRARY extern_glew)
ELSE()
SET(CYCLES_GLEW_LIBRARY ${GLEW_LIBRARY})
ENDIF()
########################################################################### ###########################################################################
# OpenShadingLanguage # OpenShadingLanguage
@@ -165,12 +171,12 @@ IF(WITH_CYCLES_OPENCL)
IF(WIN32) IF(WIN32)
SET(OPENCL_INCLUDES "") SET(OPENCL_INCLUDES "")
SET(OPENCL_LIRBARIES "OpenCL") SET(OPENCL_LIBRARIES "OpenCL")
ENDIF() ENDIF()
IF(UNIX AND NOT APPLE) IF(UNIX AND NOT APPLE)
SET(OPENCL_INCLUDES ${CYCLES_OPENCL}) SET(OPENCL_INCLUDES ${CYCLES_OPENCL})
SET(OPENCL_LIRBARIES "OpenCL") SET(OPENCL_LIBRARIES "OpenCL")
ENDIF() ENDIF()
ADD_DEFINITIONS(-DWITH_OPENCL) ADD_DEFINITIONS(-DWITH_OPENCL)