[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22622] branches/blender2.5/blender: cmake cleanup (remove unused includes, make some within IF checks)
Campbell Barton
ideasman42 at gmail.com
Wed Aug 19 09:48:56 CEST 2009
Revision: 22622
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22622
Author: campbellbarton
Date: 2009-08-19 09:48:56 +0200 (Wed, 19 Aug 2009)
Log Message:
-----------
cmake cleanup (remove unused includes, make some within IF checks)
Modified Paths:
--------------
branches/blender2.5/blender/CMakeLists.txt
branches/blender2.5/blender/blenderplayer/CMakeLists.txt
branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt
branches/blender2.5/blender/source/blender/imbuf/CMakeLists.txt
branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt
branches/blender2.5/blender/source/blender/render/CMakeLists.txt
branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt
branches/blender2.5/blender/source/creator/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/Converter/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/Ketsji/CMakeLists.txt
Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt 2009-08-19 05:54:53 UTC (rev 22621)
+++ branches/blender2.5/blender/CMakeLists.txt 2009-08-19 07:48:56 UTC (rev 22622)
@@ -70,7 +70,7 @@
OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
OPTION(WITH_FFTW3 "Enable FFTW3 support" OFF)
OPTION(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF)
-OPTION(WITH_CXX_GUARDEDALLOC "" OFF)
+OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
Modified: branches/blender2.5/blender/blenderplayer/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/blenderplayer/CMakeLists.txt 2009-08-19 05:54:53 UTC (rev 22621)
+++ branches/blender2.5/blender/blenderplayer/CMakeLists.txt 2009-08-19 07:48:56 UTC (rev 22622)
@@ -66,17 +66,12 @@
gp_common
bf_string
bf_ghost
- bf_blenkernel
- verse
- bf_blenkernel
+ bf_blenkernel
bf_blenloader
bf_blenpluginapi
bf_blroutines
bf_converter
- bf_sumo
bf_ketsji
- extern_solid
- extern_qhull
bf_bullet
bf_common
bf_dummy
@@ -105,10 +100,13 @@
bf_dds
bf_readblenfile
blenkernel_blc
- bf_quicktime
extern_binreloc
extern_glew
- )
+ )
+
+ IF(WITH_QUICKTIME)
+ SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} quicktime)
+ ENDIF(WITH_QUICKTIME)
IF(WITH_CXX_GUARDEDALLOC)
SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
Modified: branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/editors/CMakeLists.txt 2009-08-19 05:54:53 UTC (rev 22621)
+++ branches/blender2.5/blender/source/blender/editors/CMakeLists.txt 2009-08-19 07:48:56 UTC (rev 22622)
@@ -31,10 +31,10 @@
../../../intern/guardedalloc ../../../intern/memutil
../blenlib ../makesdna ../makesrna ../blenkernel
../include ../imbuf ../render/extern/include
- ../../../intern/bsp/extern ../radiosity/extern/include
+ ../../../intern/bsp/extern
../../../intern/decimation/extern ../blenloader ../python
../../kernel/gen_system ../readstreamglue
- ../quicktime ../../../intern/elbeem/extern
+ ../../../intern/elbeem/extern
../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include ../../../intern/smoke/extern
../../../intern/audaspace/intern
../nodes
@@ -59,7 +59,7 @@
ENDIF(WITH_OPENJPEG)
IF(WITH_QUICKTIME)
- SET(INC ${INC} ${QUICKTIME_INC})
+ SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
Modified: branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt 2009-08-19 05:54:53 UTC (rev 22621)
+++ branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt 2009-08-19 07:48:56 UTC (rev 22622)
@@ -35,10 +35,9 @@
../../blenlib ../../makesdna ../../makesrna ../../blenkernel
../../include ../../imbuf
../../render/extern/include ../../../../intern/bsp/extern
- ../../radiosity/extern/include
../../../intern/decimation/extern ../../blenloader
../../../kernel/gen_system ../../readstreamglue
- ../../quicktime ../../../../intern/elbeem/extern
+ ../../../../intern/elbeem/extern
../../../../intern/ghost ../../../../intern/opennl/extern
../../nodes
)
@@ -52,7 +51,7 @@
ENDIF(WITH_OPENEXR)
IF(WITH_QUICKTIME)
- SET(INC ${INC} ${QUICKTIME_INC})
+ SET(INC ${INC} ../../quicktime ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
Modified: branches/blender2.5/blender/source/blender/imbuf/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/imbuf/CMakeLists.txt 2009-08-19 05:54:53 UTC (rev 22621)
+++ branches/blender2.5/blender/source/blender/imbuf/CMakeLists.txt 2009-08-19 07:48:56 UTC (rev 22622)
@@ -28,7 +28,7 @@
SET(INC
. ../makesdna ../../../intern/guardedalloc ../../../intern/memutil ../blenlib
- ../avi ../quicktime ../blenkernel
+ ../avi ../blenkernel
${JPEG_INC}
${PNG_INC}
${TIFF_INC}
@@ -45,7 +45,7 @@
ENDIF(WITH_OPENJPEG)
IF(WITH_QUICKTIME)
- SET(INC ${INC} ${QUICKTIME_INC})
+ SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
Modified: branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt 2009-08-19 05:54:53 UTC (rev 22621)
+++ branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt 2009-08-19 07:48:56 UTC (rev 22622)
@@ -29,7 +29,7 @@
. ../../../intern/guardedalloc ../editors/include ../blenlib ../makesdna
../render/extern/include ../../../intern/decimation/extern ../makesrna
../imbuf ../avi ../../../intern/elbeem/extern
- ../../../intern/iksolver/extern ../blenloader ../quicktime
+ ../../../intern/iksolver/extern ../blenloader
../blenkernel ../../../extern/glew/include ../gpu
${ZLIB_INC}
)
@@ -39,7 +39,7 @@
ENDIF(WITH_OPENEXR)
IF(WITH_QUICKTIME)
- SET(INC ${INC} ${QUICKTIME_INC})
+ SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
Modified: branches/blender2.5/blender/source/blender/render/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/render/CMakeLists.txt 2009-08-19 05:54:53 UTC (rev 22621)
+++ branches/blender2.5/blender/source/blender/render/CMakeLists.txt 2009-08-19 07:48:56 UTC (rev 22622)
@@ -28,8 +28,8 @@
SET(INC
intern/include ../../../intern/guardedalloc ../blenlib ../makesdna
- extern/include ../blenkernel ../radiosity/extern/include ../imbuf
- ../quicktime ../include ../../kernel/gen_messaging ../blenloader
+ extern/include ../blenkernel ../imbuf
+ ../include ../../kernel/gen_messaging ../blenloader
../makesrna
)
@@ -38,7 +38,7 @@
ENDIF(WITH_OPENEXR)
IF(WITH_QUICKTIME)
- SET(INC ${INC} ${QUICKTIME_INC})
+ SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
Modified: branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt 2009-08-19 05:54:53 UTC (rev 22621)
+++ branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt 2009-08-19 07:48:56 UTC (rev 22622)
@@ -31,10 +31,10 @@
../../../intern/guardedalloc ../../../intern/memutil
../blenlib ../makesdna ../makesrna ../blenkernel
../include ../imbuf ../render/extern/include
- ../../../intern/bsp/extern ../radiosity/extern/include
+ ../../../intern/bsp/extern
../../../intern/decimation/extern ../blenloader
../../kernel/gen_system ../readstreamglue
- ../quicktime ../../../intern/elbeem/extern
+ ../../../intern/elbeem/extern
../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include
../nodes
../gpu
@@ -51,7 +51,7 @@
ENDIF(WITH_OPENEXR)
IF(WITH_QUICKTIME)
- SET(INC ${INC} ${QUICKTIME_INC})
+ SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME)
Modified: branches/blender2.5/blender/source/creator/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/creator/CMakeLists.txt 2009-08-19 05:54:53 UTC (rev 22621)
+++ branches/blender2.5/blender/source/creator/CMakeLists.txt 2009-08-19 07:48:56 UTC (rev 22622)
@@ -337,7 +337,6 @@
bf_moto
bf_python
bf_gen_python
- bf_quicktime
extern_binreloc
extern_glew
extern_libopenjpeg
@@ -352,6 +351,11 @@
SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp)
ENDIF(WITH_CXX_GUARDEDALLOC)
+ IF(WITH_QUICKTIME)
+ SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_quicktime)
+ ENDIF(WITH_QUICKTIME)
+
+
FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
SET(REMLIB ${SORTLIB})
FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS})
Modified: branches/blender2.5/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/gameengine/BlenderRoutines/CMakeLists.txt 2009-08-19 05:54:53 UTC (rev 22621)
+++ branches/blender2.5/blender/source/gameengine/BlenderRoutines/CMakeLists.txt 2009-08-19 07:48:56 UTC (rev 22622)
@@ -27,15 +27,12 @@
../../../source/gameengine/Network
../../../source/gameengine/SceneGraph
../../../source/gameengine/Physics/common
- ../../../source/gameengine/Physics/Bullet
- ../../../source/gameengine/Physics/Sumo
- ../../../source/gameengine/Physics/Sumo/Fuzzics/include
+ ../../../source/gameengine/Physics/Bullet
../../../source/gameengine/Network/LoopBackNetwork
../../../source/blender/misc
../../../source/blender/blenloader
../../../source/blender/gpu
../../../extern/bullet2/src
- ../../../extern/solid
../../../extern/glew/include
${PYTHON_INC}
)
Modified: branches/blender2.5/blender/source/gameengine/Converter/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/CMakeLists.txt 2009-08-19 05:54:53 UTC (rev 22621)
+++ branches/blender2.5/blender/source/gameengine/Converter/CMakeLists.txt 2009-08-19 07:48:56 UTC (rev 22622)
@@ -54,16 +54,12 @@
../../../source/gameengine/SceneGraph
../../../source/gameengine/Physics/common
../../../source/gameengine/Physics/Bullet
- ../../../source/gameengine/Physics/BlOde
../../../source/gameengine/Physics/Dummy
- ../../../source/gameengine/Physics/Sumo
- ../../../source/gameengine/Physics/Sumo/Fuzzics/include
../../../source/gameengine/Network/LoopBackNetwork
../../../source/blender/misc
../../../source/blender/blenloader
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list