Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: svn merge -r41613:41627 ^/trunk/blender

Browse Source
This commit is contained in:
Brecht Van Lommel
2011-11-07 17:13:32 +00:00
parent 5ef9039b7e 69ad40f9ea
commit dca15b215d
38 changed files with 156 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CMakeLists.txt
View File

@@ -105,7 +105,6 @@ enable_testing()
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE )
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE )
set(INCLUDE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/include CACHE INTERNAL "" FORCE )
#-----------------------------------------------------------------------------
# Set default config options
@@ -300,10 +299,6 @@ if(WITH_CYCLES)
set(WITH_BOOST ON)
endif()
if(WITH_OPENIMAGEIO)
set(WITH_BOOST ON)
endif()
TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
# don't store paths to libs for portable distrobution
@@ -512,12 +507,7 @@ if(UNIX AND NOT APPLE)
endif()
if(WITH_BOOST)
if(CYCLES_BOOST)
set(BOOST ${CYCLES_BOOST} CACHE PATH "Boost Directory")
unset(CYCLES_BOOST CACHE)
else()
set(BOOST "/usr" CACHE PATH "Boost Directory")
endif()
set(BOOST "/usr" CACHE PATH "Boost Directory")
if(NOT BOOST_CUSTOM)
set(BOOST_ROOT ${BOOST})
@@ -532,12 +522,7 @@ if(UNIX AND NOT APPLE)
endif()
if(WITH_OPENIMAGEIO)
# temp, update
if(CYCLES_OIIO)
set(OPENIMAGEIO ${CYCLES_OIIO})
unset(CYCLES_OIIO CACHE)
endif()
set(OPENIMAGEIO "/usr" CACHE PATH "OpenImageIO Directory")
set(OPENIMAGEIO_ROOT_DIR ${OPENIMAGEIO})
find_package(OpenImageIO REQUIRED)
@@ -549,7 +534,6 @@ if(UNIX AND NOT APPLE)
if(NOT OPENIMAGEIO_FOUND)
set(WITH_OPENIMAGEIO OFF)
endif()
endif()
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
@@ -1511,6 +1495,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)
@@ -1530,7 +1515,6 @@ if(FIRST_RUN)
info_cfg_option(WITH_IMAGE_OPENJPEG)
info_cfg_option(WITH_IMAGE_REDCODE)
info_cfg_option(WITH_IMAGE_TIFF)
info_cfg_option(WITH_OPENIMAGEIO)
info_cfg_text("Audio:")
info_cfg_option(WITH_OPENAL)