[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34910] branches/soc-2010-nicks: synched with trunk at revision 34793
Nick Samarin
nicks1987 at bigmir.net
Wed Feb 16 18:11:40 CET 2011
Revision: 34910
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34910
Author: nicks
Date: 2011-02-16 17:11:39 +0000 (Wed, 16 Feb 2011)
Log Message:
-----------
synched with trunk at revision 34793
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34793
Modified Paths:
--------------
branches/soc-2010-nicks/CMakeLists.txt
branches/soc-2010-nicks/COPYING
branches/soc-2010-nicks/SConstruct
Added Paths:
-----------
branches/soc-2010-nicks/GNUmakefile
Removed Paths:
-------------
branches/soc-2010-nicks/Makefile
branches/soc-2010-nicks/projectfiles/
branches/soc-2010-nicks/projectfiles_vc7/
branches/soc-2010-nicks/projectfiles_vc9/
Modified: branches/soc-2010-nicks/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicks/CMakeLists.txt 2011-02-16 17:07:18 UTC (rev 34909)
+++ branches/soc-2010-nicks/CMakeLists.txt 2011-02-16 17:11:39 UTC (rev 34910)
@@ -1,3 +1,4 @@
+# -*- mode: cmake; indent-tabs-mode: t; -*-
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
@@ -30,8 +31,8 @@
# build the libs and objects in it. It will also conflict with the current
# Makefile system for Blender
-IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-MESSAGE(FATAL_ERROR "CMake generation for blender is not allowed within the source directory!
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+message(FATAL_ERROR "CMake generation for blender is not allowed within the source directory!
Remove the CMakeCache.txt file and try again from another folder, e.g.:
rm CMakeCache.txt
@@ -40,192 +41,222 @@
cd cmake-make
cmake -G \"Unix Makefiles\" ../blender
")
-ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+endif()
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+cmake_minimum_required(VERSION 2.6)
# quiet output for Makefiles, 'make -s' helps too
-# SET_PROPERTY(GLOBAL PROPERTY RULE_MESSAGES OFF)
+# set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
-PROJECT(Blender)
+project(Blender)
+enable_testing()
+
#-----------------------------------------------------------------------------
# Redirect output files
-SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
-SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE )
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE )
#-----------------------------------------------------------------------------
# Load some macros.
-INCLUDE(build_files/cmake/macros.cmake)
+include(build_files/cmake/macros.cmake)
#-----------------------------------------------------------------------------
# Set default config options
-GET_BLENDER_VERSION()
+get_blender_version()
# Blender internal features
-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_FLUID "Enable Elbeem (Fluid Simulation)" ON)
-OPTION(WITH_IK_ITASC "Enable ITASC IK solver" 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)
-OPTION(WITH_PLAYER "Build Player" OFF)
+option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
+option(WITH_PYTHON "Enable Embedded Python API" ON)
+option(WITH_BUILDINFO "Include extra build details" ON)
+option(WITH_IK_ITASC "Enable ITASC IK solver" 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)
+option(WITH_PLAYER "Build Player" OFF)
# (unix defaults to OpenMP On)
-IF(UNIX AND NOT APPLE)
- OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON)
-ELSE()
- OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
-ENDIF()
+if(UNIX AND NOT APPLE)
+ option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON)
+else()
+ option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
+endif()
+# Modifiers
+option(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON)
+option(WITH_MOD_DECIMATE "Enable Decimate Modifier" ON)
+option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
+
# Image format support
-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)
+option(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
+option(WITH_IMAGE_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org)" ON)
+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)
+option(WITH_IMAGE_REDCODE "Enable RedCode Image Support" OFF)
-# Audio format support
-OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
-OPTION(WITH_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
-IF(APPLE OR WIN32)
- OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF)
-ENDIF(APPLE OR WIN32)
+# Audio/Video format support
+option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu)" OFF)
+option(WITH_CODEC_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
+if(APPLE OR (WIN32 AND NOT UNIX))
+ option(WITH_CODEC_QUICKTIME "Enable Quicktime Support" OFF)
+endif()
# 3D format support
# disable opencollada on non-apple unix because opencollada has no package for debian
-IF(UNIX AND NOT APPLE)
- OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF)
-ELSE()
- OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF)
-ENDIF()
+if(UNIX AND NOT APPLE)
+ option(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org)" OFF)
+else()
+ option(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org)" OFF)
+endif()
# Sound output
-OPTION(WITH_SDL "Enable SDL for sound and joystick support" ON)
-OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
-OPTION(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF)
+option(WITH_SDL "Enable SDL for sound and joystick support" ON)
+option(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
+option(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF)
+option(WITH_SAMPLERATE "Enable samplerate conversion" ON)
# Compression
-OPTION(WITH_LZO "Enable fast LZO compression (used for pointcache)" ON)
-OPTION(WITH_LZMA "Enable best LZMA compression, (used for pointcache)" ON)
+option(WITH_LZO "Enable fast LZO compression (used for pointcache)" ON)
+option(WITH_LZMA "Enable best LZMA compression, (used for pointcache)" ON)
# Misc
-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)
+option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
+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)
- OPTION(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
- OPTION(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
-ENDIF(APPLE)
+# Debug
+option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
+mark_as_advanced(WITH_CXX_GUARDEDALLOC)
-IF(NOT WITH_BULLET AND WITH_GAMEENGINE)
- MESSAGE("WARNING: WITH_GAMEENGINE needs WITH_BULLET")
-ENDIF(NOT WITH_BULLET AND WITH_GAMEENGINE)
+option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
+mark_as_advanced(WITH_ASSERT_ABORT)
-IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
- MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
-ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
+if(APPLE)
+ option(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
+ option(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
+ option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
+endif()
-IF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
- MESSAGE("WARNING: WITH_PYTHON_INSTALL needs WITH_INSTALL")
-ENDIF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+# 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()
+
+if(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+ message("WARNING: WITH_PYTHON_INSTALL requires WITH_INSTALL")
+endif()
+
+if(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
+ message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK require WITH_SAMPLERATE")
+endif()
+
+if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
+ message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
+endif()
+
TEST_SSE_SUPPORT()
# disabled for now, not supported
-# OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
+# option(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
# For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
# On Unix:
-# cmake -D PYTHON_LIB=/usr/local/lib/python3.1/config/libpython3.1.so -D PYTHON_INC=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
+# cmake -D PYTHON_LIBRARY=/usr/local/lib/python3.1/config/libpython3.1.so -D PYTHON_INCLUDE_DIRS=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
# On Macs:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list