cmake cleanup (remove unused includes, make some within IF checks)

2009-08-19 07:48:56 +00:00
parent 680f88017f
commit 360235a5f4
14 changed files with 28 additions and 42 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
--- a/blenderplayer/CMakeLists.txt
+++ b/blenderplayer/CMakeLists.txt
@@ -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)
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@@ -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)

--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -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)

--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -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)

--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -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)

--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -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)

--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -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)

--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -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})
--- a/source/gameengine/BlenderRoutines/CMakeLists.txt
+++ b/source/gameengine/BlenderRoutines/CMakeLists.txt
@@ -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}
 )
--- a/source/gameengine/Converter/CMakeLists.txt
+++ b/source/gameengine/Converter/CMakeLists.txt
@@ -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}
 )

--- a/source/gameengine/GamePlayer/common/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/common/CMakeLists.txt
@@ -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
--- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
@@ -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}
 )
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -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}
 )