diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-08 21:00:40 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-08 21:00:40 +0400 |
| commit | 24aebc444b9c5c90d44fba7cae4f619596d15594 (patch) | |
| tree | 5020a710296c6116b946bdf8ee62a65640ddf7af /CMakeLists.txt | |
| parent | 5f40c0e9a5b5665e559b441c7659050ff861931d (diff) | |
| parent | d8ecac61266918a1ac001c5f811ce50d2d2a2bbb (diff) | |
Cycles Merge
Documentation:
http://wiki.blender.org/index.php/Dev:2.6/Source/Render/Cycles
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles
Cycles is available is an extra render engine from the top header. It's not
feature complete, consider this as a first preview release. Known bugs:
http://wiki.blender.org/index.php/Dev:2.6/Source/Render/Cycles/KnownIssues
Building currently only works with CMake, SCons support is being worked on
and should be available soon.
Also missing still is precompiled OpenImageIO and Boost for Linux, these will
be added later in lib/linux*, if you do not have these installed on your
system, Cycles will simply not be available.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ed7eab8b4e..17ea5cf249d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,6 +213,10 @@ if(UNIX AND NOT APPLE) endif() option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON) +# Cycles +option(WITH_CYCLES "Enable Cycles Render Engine" ON) +OPTION(WITH_CYCLES_TEST "Build cycles test application" OFF) + # disable for now, but plan to support on all platforms eventually option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF) mark_as_advanced(WITH_MEM_JEMALLOC) @@ -284,6 +288,12 @@ if(WITH_PYTHON_MODULE) set(WITH_HEADLESS ON) endif() +# auto enable openimageio and boost for cycles +if(WITH_CYCLES) + set(WITH_OPENIMAGEIO ON) + set(WITH_BOOST ON) +endif() + TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG) # don't store paths to libs for portable distrobution @@ -497,7 +507,7 @@ if(UNIX AND NOT APPLE) if(NOT BOOST_CUSTOM) set(BOOST_ROOT ${BOOST}) set(Boost_USE_MULTITHREADED ON) - find_package(Boost 1.34 REQUIRED COMPONENTS filesystem regex system thread) + find_package(Boost 1.34 COMPONENTS filesystem regex system thread) endif() set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS}) @@ -510,7 +520,7 @@ if(UNIX AND NOT APPLE) set(OPENIMAGEIO "/usr" CACHE PATH "OpenImageIO Directory") set(OPENIMAGEIO_ROOT_DIR ${OPENIMAGEIO}) - find_package(OpenImageIO REQUIRED) + find_package(OpenImageIO) set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES}) set(OPENIMAGEIO_LIBPATH) # TODO, remove and reference the absolute path everywhere @@ -518,6 +528,8 @@ if(UNIX AND NOT APPLE) if(NOT OPENIMAGEIO_FOUND) set(WITH_OPENIMAGEIO OFF) + set(WITH_CYCLES OFF) + message(STATUS "OpenImageIO not found, disabling WITH_CYCLES") endif() endif() @@ -1480,6 +1492,7 @@ if(FIRST_RUN) info_cfg_option(WITH_FFTW3) info_cfg_option(WITH_INTERNATIONAL) info_cfg_option(WITH_INPUT_NDOF) + info_cfg_option(WITH_CYCLES) info_cfg_text("Compiler Options:") info_cfg_option(WITH_BUILDINFO) |