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-09-01 23:00:23 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-09-01 23:00:23 +0400
commit27102bfec4845df5ba8e65f7ca64d04840fbeab3 (patch)
treed83efbd5211512c4c504020b3e6f99b4332b62c9 /intern/cycles/cmake
parentaf7171524ab6809a5ebe51c3cbfdff17e2cd74aa (diff)
Cycles: OpenCL library is now dynamically loaded so that blender doesn't crash
if it's not installed on the system. Code copied from clew.h/clew.c in CLCC: http://clcc.sourceforge.net/
Diffstat (limited to 'intern/cycles/cmake')
-rw-r--r--intern/cycles/cmake/external_libs.cmake21
1 files changed, 0 insertions, 21 deletions
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake
index d53be9f6fe6..fb7ba9cc3f2 100644
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
@@ -104,24 +104,3 @@ if(WITH_CYCLES_CUDA)
endif()
-###########################################################################
-# OpenCL
-
-if(WITH_CYCLES_OPENCL)
-
- if(APPLE)
- set(OPENCL_INCLUDE_DIR "/System/Library/Frameworks/OpenCL.framework/Headers")
- set(OPENCL_LIBRARIES "-framework OpenCL")
- endif()
-
- if(WIN32)
- set(OPENCL_INCLUDE_DIR "")
- set(OPENCL_LIBRARIES "OpenCL")
- endif()
-
- if(UNIX AND NOT APPLE)
- set(OPENCL_INCLUDE_DIR ${CYCLES_OPENCL})
- set(OPENCL_LIBRARIES "OpenCL")
- endif()
-endif()
-