diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-11 18:14:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-11 18:14:04 +0400 |
| commit | b308e613126f8c89e954705aa512a3ef6a1f551d (patch) | |
| tree | 4a875450b2ba9766fbdf4914e8cb003e8132497c /source/blender/makesrna/intern/CMakeLists.txt | |
| parent | 98bdf0274b1052efe25b6216f488d2a40fa43d1c (diff) | |
| parent | cda5d1769d71832a6b04ed6c91bac101c482e5f7 (diff) | |
svn merge ^/trunk/blender -r43220:43278 --accept postpone
Diffstat (limited to 'source/blender/makesrna/intern/CMakeLists.txt')
| -rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index d253bd555f0..2782aa8aca5 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -143,6 +143,9 @@ set(INC_SYS ) +if(WITH_CYCLES) + add_definitions(-DWITH_CYCLES) +endif() if(WITH_PYTHON) add_definitions(-DWITH_PYTHON) @@ -247,6 +250,7 @@ blender_include_dirs( ../../editors/include ../../render/extern/include ../../../../intern/audaspace/intern + ../../../../intern/cycles/blender ../../../../intern/guardedalloc ../../../../intern/memutil ) |