[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33549] trunk/blender: use lowercase for cmake builtin names and macros, remove contents in else( ) and endif() which is no longer needed.
Campbell Barton
ideasman42 at gmail.com
Wed Dec 8 09:43:07 CET 2010
Revision: 33549
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33549
Author: campbellbarton
Date: 2010-12-08 09:43:06 +0100 (Wed, 08 Dec 2010)
Log Message:
-----------
use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/cmake/macros.cmake
trunk/blender/extern/CMakeLists.txt
trunk/blender/extern/binreloc/CMakeLists.txt
trunk/blender/extern/bullet2/CMakeLists.txt
trunk/blender/extern/bullet2/src/BulletCollision/CMakeLists.txt
trunk/blender/extern/bullet2/src/BulletDynamics/CMakeLists.txt
trunk/blender/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
trunk/blender/extern/bullet2/src/CMakeLists.txt
trunk/blender/extern/bullet2/src/LinearMath/CMakeLists.txt
trunk/blender/extern/glew/CMakeLists.txt
trunk/blender/extern/libopenjpeg/CMakeLists.txt
trunk/blender/extern/libredcode/CMakeLists.txt
trunk/blender/extern/lzma/CMakeLists.txt
trunk/blender/extern/lzo/CMakeLists.txt
trunk/blender/intern/CMakeLists.txt
trunk/blender/intern/audaspace/CMakeLists.txt
trunk/blender/intern/boolop/CMakeLists.txt
trunk/blender/intern/bsp/CMakeLists.txt
trunk/blender/intern/container/CMakeLists.txt
trunk/blender/intern/decimation/CMakeLists.txt
trunk/blender/intern/elbeem/CMakeLists.txt
trunk/blender/intern/ghost/CMakeLists.txt
trunk/blender/intern/guardedalloc/CMakeLists.txt
trunk/blender/intern/iksolver/CMakeLists.txt
trunk/blender/intern/itasc/CMakeLists.txt
trunk/blender/intern/memutil/CMakeLists.txt
trunk/blender/intern/moto/CMakeLists.txt
trunk/blender/intern/opennl/CMakeLists.txt
trunk/blender/intern/smoke/CMakeLists.txt
trunk/blender/intern/string/CMakeLists.txt
trunk/blender/source/CMakeLists.txt
trunk/blender/source/blender/CMakeLists.txt
trunk/blender/source/blender/avi/CMakeLists.txt
trunk/blender/source/blender/blenfont/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenlib/CMakeLists.txt
trunk/blender/source/blender/blenloader/CMakeLists.txt
trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
trunk/blender/source/blender/collada/CMakeLists.txt
trunk/blender/source/blender/editors/CMakeLists.txt
trunk/blender/source/blender/editors/animation/CMakeLists.txt
trunk/blender/source/blender/editors/armature/CMakeLists.txt
trunk/blender/source/blender/editors/curve/CMakeLists.txt
trunk/blender/source/blender/editors/datafiles/CMakeLists.txt
trunk/blender/source/blender/editors/gpencil/CMakeLists.txt
trunk/blender/source/blender/editors/interface/CMakeLists.txt
trunk/blender/source/blender/editors/mesh/CMakeLists.txt
trunk/blender/source/blender/editors/metaball/CMakeLists.txt
trunk/blender/source/blender/editors/object/CMakeLists.txt
trunk/blender/source/blender/editors/physics/CMakeLists.txt
trunk/blender/source/blender/editors/render/CMakeLists.txt
trunk/blender/source/blender/editors/screen/CMakeLists.txt
trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt
trunk/blender/source/blender/editors/sound/CMakeLists.txt
trunk/blender/source/blender/editors/space_action/CMakeLists.txt
trunk/blender/source/blender/editors/space_api/CMakeLists.txt
trunk/blender/source/blender/editors/space_buttons/CMakeLists.txt
trunk/blender/source/blender/editors/space_console/CMakeLists.txt
trunk/blender/source/blender/editors/space_file/CMakeLists.txt
trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
trunk/blender/source/blender/editors/space_image/CMakeLists.txt
trunk/blender/source/blender/editors/space_info/CMakeLists.txt
trunk/blender/source/blender/editors/space_logic/CMakeLists.txt
trunk/blender/source/blender/editors/space_nla/CMakeLists.txt
trunk/blender/source/blender/editors/space_node/CMakeLists.txt
trunk/blender/source/blender/editors/space_outliner/CMakeLists.txt
trunk/blender/source/blender/editors/space_script/CMakeLists.txt
trunk/blender/source/blender/editors/space_sequencer/CMakeLists.txt
trunk/blender/source/blender/editors/space_sound/CMakeLists.txt
trunk/blender/source/blender/editors/space_text/CMakeLists.txt
trunk/blender/source/blender/editors/space_time/CMakeLists.txt
trunk/blender/source/blender/editors/space_userpref/CMakeLists.txt
trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt
trunk/blender/source/blender/editors/transform/CMakeLists.txt
trunk/blender/source/blender/editors/util/CMakeLists.txt
trunk/blender/source/blender/editors/uvedit/CMakeLists.txt
trunk/blender/source/blender/gpu/CMakeLists.txt
trunk/blender/source/blender/ikplugin/CMakeLists.txt
trunk/blender/source/blender/imbuf/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
trunk/blender/source/blender/makesdna/CMakeLists.txt
trunk/blender/source/blender/makesdna/intern/CMakeLists.txt
trunk/blender/source/blender/makesrna/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/rna_texture.c
trunk/blender/source/blender/modifiers/CMakeLists.txt
trunk/blender/source/blender/nodes/CMakeLists.txt
trunk/blender/source/blender/python/CMakeLists.txt
trunk/blender/source/blender/python/generic/CMakeLists.txt
trunk/blender/source/blender/python/intern/CMakeLists.txt
trunk/blender/source/blender/quicktime/CMakeLists.txt
trunk/blender/source/blender/readblenfile/CMakeLists.txt
trunk/blender/source/blender/render/CMakeLists.txt
trunk/blender/source/blender/windowmanager/CMakeLists.txt
trunk/blender/source/blenderplayer/CMakeLists.txt
trunk/blender/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
trunk/blender/source/creator/CMakeLists.txt
trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
trunk/blender/source/gameengine/CMakeLists.txt
trunk/blender/source/gameengine/Converter/CMakeLists.txt
trunk/blender/source/gameengine/Expressions/CMakeLists.txt
trunk/blender/source/gameengine/GameLogic/CMakeLists.txt
trunk/blender/source/gameengine/GamePlayer/CMakeLists.txt
trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
trunk/blender/source/gameengine/GamePlayer/xembed/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
trunk/blender/source/gameengine/Network/CMakeLists.txt
trunk/blender/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
trunk/blender/source/gameengine/Physics/Bullet/CMakeLists.txt
trunk/blender/source/gameengine/Physics/Dummy/CMakeLists.txt
trunk/blender/source/gameengine/Physics/common/CMakeLists.txt
trunk/blender/source/gameengine/Rasterizer/CMakeLists.txt
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
trunk/blender/source/gameengine/SceneGraph/CMakeLists.txt
trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt
trunk/blender/source/kernel/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2010-12-08 06:59:13 UTC (rev 33548)
+++ trunk/blender/CMakeLists.txt 2010-12-08 08:43:06 UTC (rev 33549)
@@ -30,8 +30,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,120 +40,120 @@
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)
#-----------------------------------------------------------------------------
# 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)
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
#-----------------------------------------------------------------------------
# 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_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)
+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)
+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)" 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)
+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/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(APPLE OR (WIN32 AND NOT UNIX))
+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_SAMPLERATE "Enable samplerate conversion" ON)
+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_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)
- 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)
+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()
# only for developers who want to make this functional
-# OPTION(WITH_LCMS "Enable color correction with lcms" OFF)
+# 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(NOT WITH_GAMEENGINE AND WITH_PLAYER)
+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(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+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(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
+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(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
+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:
@@ -166,78 +166,78 @@
#-----------------------------------------------------------------------------
#Platform specifics
-IF(UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE)
- IF(WITH_OPENAL)
- FIND_PACKAGE(OpenAL)
- IF(NOT OPENAL_FOUND)
- SET(WITH_OPENAL OFF)
- ENDIF(NOT OPENAL_FOUND)
- ENDIF(WITH_OPENAL)
+ if(WITH_OPENAL)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list