cmake cleanup (remove unused includes, make some within IF checks)
authorCampbell Barton <ideasman42@gmail.com>
Wed, 19 Aug 2009 07:48:56 +0000 (07:48 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 19 Aug 2009 07:48:56 +0000 (07:48 +0000)
14 files changed:
CMakeLists.txt
blenderplayer/CMakeLists.txt
source/blender/editors/CMakeLists.txt
source/blender/editors/screen/CMakeLists.txt
source/blender/imbuf/CMakeLists.txt
source/blender/nodes/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/blender/windowmanager/CMakeLists.txt
source/creator/CMakeLists.txt
source/gameengine/BlenderRoutines/CMakeLists.txt
source/gameengine/Converter/CMakeLists.txt
source/gameengine/GamePlayer/common/CMakeLists.txt
source/gameengine/GamePlayer/ghost/CMakeLists.txt
source/gameengine/Ketsji/CMakeLists.txt

index 2f12d34..00d2244 100644 (file)
@@ -70,7 +70,7 @@ OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)"
 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)
index 77bc059..0407361 100644 (file)
@@ -66,17 +66,12 @@ IF(UNIX)
     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 @@ IF(UNIX)
     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)
index 96b6fa5..c40b18e 100644 (file)
@@ -31,10 +31,10 @@ SET(INC ../windowmanager
   ../../../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 @@ IF(WITH_OPENJPEG)
 ENDIF(WITH_OPENJPEG)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
+  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
index 6861f82..7429f45 100644 (file)
@@ -35,10 +35,9 @@ SET(INC ../../windowmanager
   ../../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 @@ IF(WITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
+  SET(INC ${INC} ../../quicktime ${QUICKTIME_INC})
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
index 391f6e9..76dd2af 100644 (file)
@@ -28,7 +28,7 @@ FILE(GLOB SRC intern/*.c)
 
 SET(INC 
   . ../makesdna ../../../intern/guardedalloc ../../../intern/memutil ../blenlib
-  ../avi ../quicktime ../blenkernel
+  ../avi ../blenkernel
   ${JPEG_INC}
   ${PNG_INC}
   ${TIFF_INC}
@@ -45,7 +45,7 @@ IF(WITH_OPENJPEG)
 ENDIF(WITH_OPENJPEG)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
+  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
index ca21ba5..bba96ad 100644 (file)
@@ -29,7 +29,7 @@ SET(INC
   . ../../../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 @@ IF(WITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
+  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
index 411bd61..185662c 100644 (file)
@@ -28,8 +28,8 @@ FILE(GLOB SRC intern/source/*.c)
 
 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 @@ IF(WITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
+  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
index a268ffe..26d4ab2 100644 (file)
@@ -31,10 +31,10 @@ SET(INC .
   ../../../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 @@ IF(WITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
 IF(WITH_QUICKTIME)
-  SET(INC ${INC} ${QUICKTIME_INC})
+  SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
index a9368e0..3a2cef2 100644 (file)
@@ -337,7 +337,6 @@ IF(UNIX)
     bf_moto 
     bf_python
     bf_gen_python
-    bf_quicktime
     extern_binreloc
     extern_glew
     extern_libopenjpeg
@@ -352,6 +351,11 @@ IF(UNIX)
     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})
index 704e3ce..42e270d 100644 (file)
@@ -27,15 +27,12 @@ SET(INC
   ../../../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}
 )
index 6732a62..f16e9e1 100644 (file)
@@ -54,16 +54,12 @@ SET(INC
   ../../../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
   ../../../source/blender/gpu
   ../../../extern/bullet2/src
-  ../../../extern/solid
   ${PYTHON_INC}
 )
 
index af25f4b..da99087 100644 (file)
@@ -60,8 +60,6 @@ SET(INC
   ../../../../source/gameengine/Network
   ../../../../source/gameengine/SceneGraph
   ../../../../source/gameengine/Physics/common
-  ../../../../source/gameengine/Physics/Sumo
-  ../../../../source/gameengine/Physics/Sumo/Fuzzics/include
   ../../../../source/gameengine/Network/LoopBackNetwork
   ../../../../source/gameengine/GamePlayer/ghost
   ../../../../source/blender/misc
index e07a7fb..377d765 100644 (file)
@@ -57,14 +57,11 @@ SET(INC
   ../../../../source/gameengine/Network
   ../../../../source/gameengine/SceneGraph
   ../../../../source/gameengine/Physics/common
-  ../../../../source/gameengine/Physics/Sumo
-  ../../../../source/gameengine/Physics/Sumo/Fuzzics/include
   ../../../../source/gameengine/Network/LoopBackNetwork
   ../../../../source/gameengine/GamePlayer/common
   ../../../../source/blender/misc
   ../../../../source/blender/blenloader
   ../../../../source/blender/gpu
-  ../../../../extern/solid
   ../../../../extern/glew/include
   ${PYTHON_INC}
 )
index 77bdd80..c91a377 100644 (file)
@@ -52,15 +52,12 @@ SET(INC
   ../../../source/gameengine/SceneGraph 
   ../../../source/gameengine/Physics/common
   ../../../source/gameengine/Physics/Bullet 
-  ../../../source/gameengine/Physics/Sumo
-  ../../../source/gameengine/Physics/Sumo/Fuzzics/include 
   ../../../source/gameengine/Network/LoopBackNetwork
   ../../../intern/audaspace/intern
   ../../../source/blender/misc 
   ../../../source/blender/blenloader
   ../../../source/blender/gpu
   ../../../extern/bullet2/src
-  ../../../extern/solid
   ../../../extern/glew/include
   ${PYTHON_INC}
 )