diff options
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/blender/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 10 |
3 files changed, 10 insertions, 4 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index 0934124ea25..c250662aecf 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -18,7 +18,7 @@ SET(LIBRARIES cycles_util ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} - ${GLEW_LIBRARY} + ${CYCLES_GLEW_LIBRARY} ${OPENIMAGEIO_LIBRARY}) IF(WITH_CYCLES_TEST) diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index 56d08b61b65..784f78a54d4 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -43,7 +43,7 @@ SET(LIBRARIES ${OPENGL_LIBRARIES} ${OPENIMAGEIO_LIBRARY} ${GLUT_LIBRARIES} - ${GLEW_LIBRARIES} + ${CYCLES_GLEW_LIBRARY} ${BLENDER_LIBRARIES}) IF(WITH_CYCLES_OSL) 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) |