diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-21 15:13:46 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-21 15:13:46 +0400 |
commit | e5b457dbc9f009740fe3cca2c8cb44fa88f1f03a (patch) | |
tree | 63e1eeba718717d0c18db9f2a0542639c8f4e2ec /intern/cycles/CMakeLists.txt | |
parent | 5f4c7e5da48c488b807635dccee03e1476e2f0bc (diff) |
Cycles: merge some changes from a local branch to bring network rendering a bit
more up to date, still nowhere near working though, but might as well commit this
in case someone else is interested in working on it.
Diffstat (limited to 'intern/cycles/CMakeLists.txt')
-rw-r--r-- | intern/cycles/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 12829f15aed..3242acf3edd 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -68,7 +68,7 @@ if(WITH_CYCLES_BLENDER) add_subdirectory(blender) endif() -if(WITH_CYCLES_TEST) +if(WITH_CYCLES_TEST OR WITH_CYCLES_NETWORK) add_subdirectory(app) endif() |