diff options
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 94 |
1 files changed, 50 insertions, 44 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bec1353a8cf..cb131c6e5e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,7 @@ OPTION(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON) OPTION(WITH_LCMS "Enable color correction with lcms" OFF) OPTION(WITH_PYTHON "Enable Embedded Python API" ON) OPTION(WITH_BUILDINFO "Include extra build details" ON) -OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)" ON) +OPTION(WITH_FLUID "Enable Elbeem (Fluid Simulation)" ON) OPTION(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF) OPTION(WITH_BULLET "Enable Bullet (Physics Engine)" ON) OPTION(WITH_GAMEENGINE "Enable Game Engine" ON) @@ -82,10 +82,12 @@ ELSE() ENDIF() # Image format support -OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON) -OPTION(WITH_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF) -OPTION(WITH_TIFF "Enable LibTIFF Support" ON) -OPTION(WITH_DDS "Enable DDS Support" ON) +OPTION(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON) +OPTION(WITH_IMAGE_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF) +OPTION(WITH_IMAGE_TIFF "Enable LibTIFF Support" ON) +OPTION(WITH_IMAGE_DDS "Enable DDS Image Support" ON) +OPTION(WITH_IMAGE_CINEON "Enable CINEON and DPX Image Support" ON) +OPTION(WITH_IMAGE_HDR "Enable HDR Image Support" ON) # Audio format support OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF) @@ -115,6 +117,7 @@ OPTION(WITH_LZMA "Enable best LZMA compression, (used for pointcache)" OPTION(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON) OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF) OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON) +OPTION(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON) IF(APPLE) OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON) @@ -130,6 +133,10 @@ IF(NOT WITH_GAMEENGINE AND WITH_PLAYER) MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE") ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER) +IF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL) + MESSAGE("WARNING: WITH_PYTHON_INSTALL needs WITH_INSTALL") +ENDIF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL) + TEST_SSE_SUPPORT() # disabled for now, not supported @@ -215,7 +222,7 @@ IF(UNIX AND NOT APPLE) ENDIF(NOT SDL_FOUND) ENDIF(WITH_SDL) - IF(WITH_OPENEXR) + IF(WITH_IMAGE_OPENEXR) SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory") FIND_PATH(OPENEXR_INC ImfXdr.h @@ -230,16 +237,16 @@ IF(UNIX AND NOT APPLE) SET(OPENEXR_LIB Half IlmImf Iex Imath) IF(NOT OPENEXR_INC) - SET(WITH_OPENEXR OFF) + SET(WITH_IMAGE_OPENEXR OFF) ENDIF(NOT OPENEXR_INC) - ENDIF(WITH_OPENEXR) + ENDIF(WITH_IMAGE_OPENEXR) - IF(WITH_TIFF) + IF(WITH_IMAGE_TIFF) FIND_PACKAGE(TIFF) IF(NOT TIFF_FOUND) - SET(WITH_TIFF OFF) + SET(WITH_IMAGE_TIFF OFF) ENDIF(NOT TIFF_FOUND) - ENDIF(WITH_TIFF) + ENDIF(WITH_IMAGE_TIFF) FIND_PACKAGE(JPEG REQUIRED) @@ -309,12 +316,6 @@ IF(UNIX AND NOT APPLE) SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts") - IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) - SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}") - ADD_DEFINITIONS(-D__SSE__) - ADD_DEFINITIONS(-D__MMX__) - ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) - SET(PLATFORM_LINKFLAGS "-pthread") # Better warnings @@ -492,7 +493,7 @@ IF(WIN32) SET(FFMPEG_LIBPATH ${FFMPEG}/lib) ENDIF(WITH_FFMPEG) - IF(WITH_OPENEXR) + IF(WITH_IMAGE_OPENEXR) SET(OPENEXR ${LIBDIR}/openexr) SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath) SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread) @@ -504,14 +505,14 @@ IF(WIN32) IF (MSVC90) SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008) ENDIF(MSVC90) - ENDIF(WITH_OPENEXR) + ENDIF(WITH_IMAGE_OPENEXR) - IF(WITH_TIFF) + IF(WITH_IMAGE_TIFF) SET(TIFF ${LIBDIR}/tiff) SET(TIFF_LIBRARY libtiff) SET(TIFF_INCLUDE_DIR ${TIFF}/include) SET(TIFF_LIBPATH ${TIFF}/lib) - ENDIF(WITH_TIFF) + ENDIF(WITH_IMAGE_TIFF) IF(WITH_JACK) SET(JACK ${LIBDIR}/jack) @@ -602,19 +603,19 @@ IF(WIN32) SET(FFMPEG_LIBPATH ${FFMPEG}/lib) ENDIF(WITH_FFMPEG) - IF(WITH_OPENEXR) + IF(WITH_IMAGE_OPENEXR) SET(OPENEXR ${LIBDIR}/gcc/openexr) SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR) SET(OPENEXR_LIB Half IlmImf Imath IlmThread) SET(OPENEXR_LIBPATH ${OPENEXR}/lib) - ENDIF(WITH_OPENEXR) + ENDIF(WITH_IMAGE_OPENEXR) - IF(WITH_TIFF) + IF(WITH_IMAGE_TIFF) SET(TIFF ${LIBDIR}/gcc/tiff) SET(TIFF_LIBRARY tiff) SET(TIFF_INCLUDE_DIR ${TIFF}/include) SET(TIFF_LIBPATH ${TIFF}/lib) - ENDIF(WITH_TIFF) + ENDIF(WITH_IMAGE_TIFF) IF(WITH_JACK) SET(JACK ${LIBDIR}/jack) @@ -626,12 +627,6 @@ IF(WIN32) SET(WITH_JACK OFF) ENDIF(WITH_JACK) - IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) - SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}") - ADD_DEFINITIONS(-D__SSE__) - ADD_DEFINITIONS(-D__MMX__) - ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) - ENDIF(MSVC) ENDIF(WIN32) @@ -722,12 +717,12 @@ IF(APPLE) SET(FREETYPE_LIBPATH ${FREETYPE}/lib) SET(FREETYPE_LIBRARY freetype) - IF(WITH_OPENEXR) + IF(WITH_IMAGE_OPENEXR) SET(OPENEXR ${LIBDIR}/openexr) SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR ${OPENEXR}/include) SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread) SET(OPENEXR_LIBPATH ${OPENEXR}/lib) - ENDIF(WITH_OPENEXR) + ENDIF(WITH_IMAGE_OPENEXR) IF(WITH_LCMS) SET(LCMS ${LIBDIR}/lcms) @@ -805,18 +800,12 @@ IF(APPLE) SET(JPEG_INC "${JPEG}/include") SET(JPEG_LIBPATH ${JPEG}/lib) - IF(WITH_TIFF) + IF(WITH_IMAGE_TIFF) SET(TIFF ${LIBDIR}/tiff) SET(TIFF_INCLUDE_DIR ${TIFF}/include) SET(TIFF_LIBRARY tiff) SET(TIFF_LIBPATH ${TIFF}/lib) - ENDIF(WITH_TIFF) - - IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) - SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}") - ADD_DEFINITIONS(-D__SSE__) - ADD_DEFINITIONS(-D__MMX__) - ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) + ENDIF(WITH_IMAGE_TIFF) SET(EXETYPE MACOSX_BUNDLE) @@ -861,14 +850,31 @@ IF(WITH_BUILDINFO) ENDIF(BUILD_REV_RETURN) ENDIF(WIN32) ENDIF(WITH_BUILDINFO) - #----------------------------------------------------------------------------- # Common. -IF(WITH_OPENJPEG) + +IF(WITH_RAYOPTIMIZATION) + IF(CMAKE_COMPILER_IS_GNUCC) + IF(SUPPORT_SSE_BUILD) + SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}") + ADD_DEFINITIONS(-D__SSE__) + ADD_DEFINITIONS(-D__MMX__) + ENDIF(SUPPORT_SSE_BUILD) + IF(SUPPORT_SSE2_BUILD) + SET(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}") + ADD_DEFINITIONS(-D__SSE2__) + IF(NOT SUPPORT_SSE_BUILD) # dont double up + ADD_DEFINITIONS(-D__MMX__) + ENDIF(NOT SUPPORT_SSE_BUILD) + ENDIF(SUPPORT_SSE2_BUILD) + ENDIF(CMAKE_COMPILER_IS_GNUCC) +ENDIF(WITH_RAYOPTIMIZATION) + +IF(WITH_IMAGE_OPENJPEG) set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg) set(OPENJPEG_INC ${OPENJPEG}) set(OPENJPEG_LIb extern_libopenjpeg) -ENDIF(WITH_OPENJPEG) +ENDIF(WITH_IMAGE_OPENJPEG) #----------------------------------------------------------------------------- # Blender WebPlugin |