svn merge ^/trunk/blender -r48415:48469
[blender.git] / CMakeLists.txt
index 72a5ebcfb1cec52353940679d3023fa315c41aff..fb2afb723e6a91c17ea1fde4d14a5cc37c82920e 100644 (file)
@@ -131,6 +131,7 @@ option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 option(WITH_GAMEENGINE    "Enable Game Engine" ON)
 option(WITH_PLAYER        "Build Player" OFF)
 option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" ON)
+option(WITH_COMPOSITOR    "Enable the tile based nodal compositor" ON)
 
 # GHOST Windowing Library Options
 option(WITH_GHOST_DEBUG   "Enable debugging output for the GHOST library" OFF)
@@ -667,7 +668,6 @@ 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()
@@ -1012,8 +1012,8 @@ elseif(WIN32)
                                set(BOOST_POSTFIX "vc100-mt-s-1_47.lib")
                                set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_47.lib")
                        else()
-                               set(BOOST_POSTFIX "vc90-mt-s-1_47.lib")
-                               set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_47.lib")                                 
+                               set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
+                               set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_49.lib")                                 
                        endif()
                        set(BOOST_LIBRARIES
                                optimized libboost_date_time-${BOOST_POSTFIX} optimized libboost_filesystem-${BOOST_POSTFIX}
@@ -1500,6 +1500,16 @@ if(APPLE OR WIN32)
        endif()
 endif()
 
+if(WITH_CYCLES)
+       if(NOT WITH_OPENIMAGEIO)
+               message(FATAL_ERROR "Cycles reqires WITH_OPENIMAGEIO, the library may not have been found. Configure OIIO or disable WITH_CYCLES")
+       endif()
+       if(NOT WITH_BOOST)
+               message(FATAL_ERROR "Cycles reqires WITH_BOOST, the library may not have been found. Configure BOOST or disable WITH_CYCLES")
+       endif()
+endif()
+
+
 # See TEST_SSE_SUPPORT() for how this is defined.
 
 if(WITH_RAYOPTIMIZATION)