diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2013-12-07 05:29:53 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-07 15:26:58 +0400 |
| commit | 85a0c5d4e1030a5fa95ad7450958a1b0fa033381 (patch) | |
| tree | 8e43b6167b7e4df8fad2a4f0f39c82fe5b3c2807 /CMakeLists.txt | |
| parent | 5c07f62fabc9b6a20c85ec5ea5e15a99353bd091 (diff) | |
Cycles: network render code updated for latest changes and improved
This actually works somewhat now, although viewport rendering is broken and any
kind of network error or connection failure will kill Blender.
* Experimental WITH_CYCLES_NETWORK cmake option
* Networked Device is shown as an option next to CPU and GPU Compute
* Various updates to work with the latest Cycles code
* Locks and thread safety for RPC calls and tiles
* Refactored pointer mapping code
* Fix error in CPU brand string retrieval code
This includes work by Doug Gale, Martijn Berger and Brecht Van Lommel.
Reviewers: brecht
Differential Revision: http://developer.blender.org/D36
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ff10d9377b..abca0eeac6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -737,6 +737,9 @@ if(UNIX AND NOT APPLE) if(WITH_INTERNATIONAL) list(APPEND __boost_packages locale) endif() + if(WITH_CYCLES_NETWORK) + list(APPEND __boost_packages serialization) + endif() find_package(Boost 1.48 COMPONENTS ${__boost_packages}) unset(__boost_packages) if(Boost_USE_STATIC_LIBS AND WITH_BOOST_ICU) @@ -1700,6 +1703,9 @@ elseif(APPLE) list(APPEND BOOST_LIBRARIES boost_locale-mt) set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -liconv") # boost_locale needs it ! endif() + if(WITH_CYCLES_NETWORK) + list(APPEND BOOST_LIBRARIES boost_serialization-mt) + endif() set(BOOST_LIBPATH ${BOOST}/lib) set(BOOST_DEFINITIONS) endif() |