diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-30 18:28:45 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-30 18:28:45 +0400 |
| commit | d032c8ba2c90695f63acfdc568db6d5a16e6c1d3 (patch) | |
| tree | 6995e06f264a65e323882a2d340e6999757a709a /source | |
| parent | 90dc1d1353ec85b67e76a3c93eacf7f7216deaae (diff) | |
disable opencl when compo is disabled.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/opencl/CMakeLists.txt | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index 3241acd7df6..3c756668578 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -99,7 +99,6 @@ add_subdirectory(blenfont) add_subdirectory(blenloader) add_subdirectory(ikplugin) add_subdirectory(gpu) -add_subdirectory(opencl) add_subdirectory(imbuf) add_subdirectory(avi) add_subdirectory(nodes) @@ -108,6 +107,7 @@ add_subdirectory(makesdna) add_subdirectory(makesrna) if(WITH_COMPOSITOR) + add_subdirectory(opencl) # later on this may be used more generally add_subdirectory(compositor) endif() diff --git a/source/blender/opencl/CMakeLists.txt b/source/blender/opencl/CMakeLists.txt index 6b645e02a6f..20dcf33d363 100644 --- a/source/blender/opencl/CMakeLists.txt +++ b/source/blender/opencl/CMakeLists.txt @@ -33,10 +33,10 @@ set(INC_SYS ) set(SRC - OCL_opencl.h - intern/clew.h - intern/clew.c - intern/OCL_opencl.c + OCL_opencl.h + intern/clew.h + intern/clew.c + intern/OCL_opencl.c ) |