use cmake WITH_MOD_ * to exclude include paths which are not used.

This commit is contained in:
Campbell Barton
2012-03-27 00:17:57 +00:00
parent ca05219f3e
commit 126c9d4caa
5 changed files with 30 additions and 16 deletions

View File

@@ -38,15 +38,11 @@ set(INC
../modifiers ../modifiers
../nodes ../nodes
../render/extern/include ../render/extern/include
../../../intern/bsp/extern
../../../intern/decimation/extern
../../../intern/elbeem/extern
../../../intern/guardedalloc ../../../intern/guardedalloc
../../../intern/iksolver/extern ../../../intern/iksolver/extern
../../../intern/memutil ../../../intern/memutil
../../../intern/mikktspace ../../../intern/mikktspace
../../../intern/opennl/extern ../../../intern/opennl/extern
../../../intern/smoke/extern
# XXX - BAD LEVEL CALL WM_api.h # XXX - BAD LEVEL CALL WM_api.h
../windowmanager ../windowmanager
@@ -333,10 +329,16 @@ if(WITH_OPENMP)
endif() endif()
if(WITH_MOD_FLUID) if(WITH_MOD_FLUID)
list(APPEND INC
../../../intern/elbeem/extern
)
add_definitions(-DWITH_MOD_FLUID) add_definitions(-DWITH_MOD_FLUID)
endif() endif()
if(WITH_MOD_SMOKE) if(WITH_MOD_SMOKE)
list(APPEND INC
../../../intern/smoke/extern
)
add_definitions(-DWITH_SMOKE) add_definitions(-DWITH_SMOKE)
endif() endif()
@@ -344,6 +346,18 @@ if(WITH_MOD_OCEANSIM)
add_definitions(-DWITH_OCEANSIM) add_definitions(-DWITH_OCEANSIM)
endif() endif()
if(WITH_MOD_DECIMATE)
list(APPEND INC
../../../intern/decimation/extern
)
endif()
if(WITH_MOD_BOOLEAN)
list(APPEND INC
../../../intern/bsp/extern
)
endif()
if(WITH_JACK) if(WITH_JACK)
add_definitions(-DWITH_JACK) add_definitions(-DWITH_JACK)
endif() endif()

View File

@@ -30,7 +30,11 @@
*/ */
#include <stddef.h> // headers for fluidsim bobj meshes
#include <stdlib.h>
#include <zlib.h>
#include <string.h>
#include <stdio.h>
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
@@ -54,14 +58,6 @@
#include "BKE_modifier.h" #include "BKE_modifier.h"
#include "BKE_mesh.h" #include "BKE_mesh.h"
// headers for fluidsim bobj meshes
#include <stdlib.h>
#include "LBM_fluidsim.h"
#include <zlib.h>
#include <string.h>
#include <stdio.h>
/* ************************* fluidsim bobj file handling **************************** */ /* ************************* fluidsim bobj file handling **************************** */

View File

@@ -103,7 +103,9 @@
#include "BKE_material.h" #include "BKE_material.h"
#include "BKE_camera.h" #include "BKE_camera.h"
#ifdef WITH_MOD_FLUID
#include "LBM_fluidsim.h" #include "LBM_fluidsim.h"
#endif
#ifdef WITH_PYTHON #ifdef WITH_PYTHON
#include "BPY_extern.h" #include "BPY_extern.h"

View File

@@ -74,7 +74,9 @@
#include "BIK_api.h" #include "BIK_api.h"
/* both in intern */ /* both in intern */
#ifdef WITH_MOD_SMOKE
#include "smoke_API.h" #include "smoke_API.h"
#endif
#ifdef WITH_LZO #ifdef WITH_LZO
#include "minilzo.h" #include "minilzo.h"

View File

@@ -73,8 +73,6 @@
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
#include "DNA_smoke_types.h" #include "DNA_smoke_types.h"
#include "smoke_API.h"
#include "BKE_smoke.h" #include "BKE_smoke.h"
/* UNUSED so far, may be enabled later */ /* UNUSED so far, may be enabled later */
@@ -82,6 +80,8 @@
#ifdef WITH_SMOKE #ifdef WITH_SMOKE
#include "smoke_API.h"
#ifdef _WIN32 #ifdef _WIN32
#include <time.h> #include <time.h>
#include <stdio.h> #include <stdio.h>