diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-08-05 11:57:50 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-08-05 11:57:50 +0400 |
commit | 77b7e1fe9abb882b7bd1d60f5273e03f079d8a54 (patch) | |
tree | 5b23af40e4995e79e584f3ea700f809e7ffbf276 /intern/cycles/util/CMakeLists.txt | |
parent | a3fac84c733f2bf0837dd2719199ee9b76bb7b36 (diff) |
Deduplicate CUDA and OpenCL wranglers
For now it was mainly about OpenCL wrangler being duplicated
between Cycles and Compositor, but with OpenSubdiv work those
wranglers were gonna to be duplicated just once again.
This commit makes it so Cycles and Compositor uses wranglers
from this repositories:
- https://github.com/CudaWrangler/cuew
- https://github.com/OpenCLWrangler/clew
This repositories are based on the wranglers we used before
and they'll be likely continued maintaining by us plus some
more players in the market.
Pretty much straightforward change with some tricks in the
CMake/SCons to make this libs being passed to the linker
after all other libraries in order to make OpenSubdiv linked
against those wranglers in the future.
For those who're worrying about Cycles being less standalone,
it's not truth, it's rather more flexible now and in the future
different wranglers might be used in Cycles. For now it'll
just mean those libs would need to be put into Cycles repository
together with some other libs from Blender such as mikkspace.
This is mainly platform maintenance commit, should not be any
changes to the user space.
Reviewers: juicyfruit, dingto, campbellbarton
Reviewed By: juicyfruit, dingto, campbellbarton
Differential Revision: https://developer.blender.org/D707
Diffstat (limited to 'intern/cycles/util/CMakeLists.txt')
-rw-r--r-- | intern/cycles/util/CMakeLists.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt index 01b5675b9f7..d9b97a7f6b0 100644 --- a/intern/cycles/util/CMakeLists.txt +++ b/intern/cycles/util/CMakeLists.txt @@ -10,10 +10,8 @@ set(INC_SYS set(SRC util_cache.cpp - util_cuda.cpp util_dynlib.cpp util_md5.cpp - util_opencl.cpp util_path.cpp util_string.cpp util_simd.cpp @@ -34,7 +32,6 @@ set(SRC_HEADERS util_args.h util_boundbox.h util_cache.h - util_cuda.h util_debug.h util_dynlib.h util_foreach.h @@ -46,7 +43,6 @@ set(SRC_HEADERS util_map.h util_math.h util_md5.h - util_opencl.h util_opengl.h util_optimization.h util_param.h |