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

Cycles: svn merge -r36495:36747 https://svn.blender.org/svnroot/bf-blender/trunk/blender/

Browse Source
This commit is contained in:
Brecht Van Lommel
2011-05-18 13:56:20 +00:00
parent a0ba4a771f a6fe2f1e18
commit 88d9d89c97
412 changed files with 5367 additions and 7192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
CMakeLists.txt
View File

@@ -180,6 +180,10 @@ option(WITH_API_INSTALL "Copy API header files into the blender install fold
# Cycles
option(WITH_CYCLES "Enable Cycles Render Engine" ON)
# 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)
# Debug
option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)" OFF)
mark_as_advanced(WITH_CXX_GUARDEDALLOC)
@@ -203,9 +207,6 @@ if(APPLE)
option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
endif()
# only for developers who want to make this functional
# option(WITH_LCMS "Enable color correction with lcms" OFF)
if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
endif()
@@ -380,13 +381,6 @@ if(UNIX AND NOT APPLE)
find_package(ZLIB REQUIRED)
if(WITH_LCMS)
set(LCMS /usr CACHE FILEPATH "LCMS directory")
set(LCMS_INCLUDE_DIR ${LCMS}/include)
set(LCMS_LIBRARY lcms)
set(LCMS_LIBPATH ${LCMS}/lib)
endif()
if(WITH_CODEC_FFMPEG)
set(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
mark_as_advanced(FFMPEG)
@@ -429,6 +423,15 @@ if(UNIX AND NOT APPLE)
set(EXPAT_LIB expat)
endif()
if(WITH_MEM_JEMALLOC)
set(JEMALLOC /usr)
set(JEMALLOC_LIBRARY jemalloc CACHE STRING "JeMalloc library")
set(JEMALLOC_LIBPATH ${JEMALLOC}/lib CACHE FILEPATH "JeMalloc library path")
# no use for this yet.
# set(JEMALLOC_INCLUDE_DIR ${JEMALLOC}/include CACHE FILEPATH "JeMalloc include path")
unset(JEMALLOC)
endif()
find_package(X11 REQUIRED)
find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
@@ -632,14 +635,7 @@ elseif(WIN32)
set(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa UTF)
set(PCRE_LIB pcre)
endif()
if(WITH_LCMS)
set(LCMS ${LIBDIR}/lcms)
set(LCMS_INCLUDE_DIR ${LCMS}/include)
set(LCMS_LIBPATH ${LCMS}/lib)
set(LCMS_LIB lcms)
endif()
if(WITH_CODEC_FFMPEG)
set(FFMPEG ${LIBDIR}/ffmpeg)
set(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc)
@@ -875,7 +871,7 @@ elseif(APPLE)
set(GETTEXT_LIB intl iconv)
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
endif()
if(WITH_FFTW3)
set(FFTW3 ${LIBDIR}/fftw3)
set(FFTW3_INC ${FFTW3}/include)
@@ -902,13 +898,6 @@ elseif(APPLE)
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
endif()
if(WITH_LCMS)
set(LCMS ${LIBDIR}/lcms)
set(LCMS_INCLUDE_DIR ${LCMS}/include)
set(LCMS_LIBRARY lcms)
set(LCMS_LIBPATH ${LCMS}/lib)
endif()
if(WITH_CODEC_FFMPEG)
set(FFMPEG ${LIBDIR}/ffmpeg)
set(FFMPEG_INC ${FFMPEG}/include)