CMake options to disable Decimate and Boolean Modifiers: WITH_MOD_BOOLEAN, WITH_MOD_DECIMATE, renamed WITH_FLUID to WITH_MOD_FLUID

CMakeLists.txt

@@ -68,7 +68,6 @@ GET_BLENDER_VERSION()
 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_FLUID        "Enable Elbeem (Fluid Simulation)" 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)
@@ -81,6 +80,11 @@ 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)
+
 # 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/)" OFF)

intern/CMakeLists.txt

@@ -29,20 +29,25 @@ ADD_SUBDIRECTORY(string)
 ADD_SUBDIRECTORY(ghost)
 ADD_SUBDIRECTORY(guardedalloc)
 ADD_SUBDIRECTORY(moto)
-ADD_SUBDIRECTORY(container)
 ADD_SUBDIRECTORY(memutil)
-ADD_SUBDIRECTORY(decimation)
 ADD_SUBDIRECTORY(iksolver)
-ADD_SUBDIRECTORY(boolop)
 ADD_SUBDIRECTORY(opennl)
 ADD_SUBDIRECTORY(smoke)
 
-IF(WITH_FLUID)
+IF(WITH_MOD_FLUID)
 	ADD_SUBDIRECTORY(elbeem)
-ENDIF(WITH_FLUID)
+ENDIF(WITH_MOD_FLUID)
+
+IF(WITH_MOD_DECIMATE)
+	ADD_SUBDIRECTORY(container)
+	ADD_SUBDIRECTORY(decimation)
+ENDIF(WITH_MOD_DECIMATE)
+
+IF(WITH_MOD_BOOLEAN)
+	ADD_SUBDIRECTORY(boolop)
+	ADD_SUBDIRECTORY(bsp)
+ENDIF(WITH_MOD_BOOLEAN)
 
 IF(WITH_IK_ITASC)
 	ADD_SUBDIRECTORY(itasc)
 ENDIF(WITH_IK_ITASC)
-
-ADD_SUBDIRECTORY(bsp)

source/blender/blenkernel/CMakeLists.txt

@@ -196,9 +196,9 @@ IF(WITH_OPENMP)
 	ADD_DEFINITIONS(-DPARALLEL=1)
 ENDIF(WITH_OPENMP)
 
-IF(NOT WITH_FLUID)
+IF(NOT WITH_MOD_FLUID)
 	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_FLUID)
+ENDIF(NOT WITH_MOD_FLUID)
 
 IF(WITH_JACK)
 	ADD_DEFINITIONS(-DWITH_JACK)

source/blender/editors/physics/CMakeLists.txt

@@ -43,9 +43,9 @@ IF(WIN32)
 	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
-IF(NOT WITH_FLUID)
+IF(NOT WITH_MOD_FLUID)
 	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_FLUID)
+ENDIF(NOT WITH_MOD_FLUID)
 
 IF(WITH_OPENMP)
 		ADD_DEFINITIONS(-DPARALLEL=1)

source/blender/makesrna/intern/CMakeLists.txt

@@ -112,9 +112,9 @@ IF(WITH_LCMS)
 	ADD_DEFINITIONS(-DWITH_LCMS)
 ENDIF(WITH_LCMS)
 
-IF(NOT WITH_FLUID)
+IF(NOT WITH_MOD_FLUID)
 	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_FLUID)
+ENDIF(NOT WITH_MOD_FLUID)
 
 IF(WITH_FFTW3)
 	ADD_DEFINITIONS(-DFFTW3=1)

source/blender/modifiers/CMakeLists.txt

@@ -31,10 +31,8 @@ SET(INC
 	../blenkernel
 	../blenkernel/intern
 	../render/extern/include
-    ../../../intern/guardedalloc
+	../../../intern/guardedalloc
-	../../../intern/decimation/extern
 	../../../intern/elbeem/extern
-	../../../intern/bsp/extern
 	${ZLIB_INC}
 )
 
@@ -43,7 +41,6 @@ SET(SRC
 	intern/MOD_array.c
 	intern/MOD_bevel.c
 	intern/MOD_boolean.c
-	intern/MOD_boolean_util.c
 	intern/MOD_build.c
 	intern/MOD_cast.c
 	intern/MOD_cloth.c
@@ -79,9 +76,19 @@ SET(SRC
 	intern/MOD_wave.c
 )
 
-IF(NOT WITH_FLUID)
+IF(WITH_MOD_BOOLEAN)
+	ADD_DEFINITIONS(-DWITH_MOD_BOOLEAN)
+	LIST(APPEND SRC intern/MOD_boolean_util.c)
+	LIST(APPEND INC ../../../intern/bsp/extern)
+ENDIF(WITH_MOD_BOOLEAN)
+
+IF(WITH_MOD_DECIMATE)
+	ADD_DEFINITIONS(-DWITH_MOD_DECIMATE)
+	LIST(APPEND INC ../../../intern/decimation/extern)
+ENDIF(WITH_MOD_BOOLEAN)
+
+IF(NOT WITH_MOD_FLUID)
 	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_FLUID)
+ENDIF(NOT WITH_MOD_FLUID)
 
 BLENDERLIB(bf_modifiers "${SRC}" "${INC}")
-

source/blender/modifiers/Makefile

@@ -30,5 +30,5 @@
 
 SOURCEDIR = source/blender/modifiers
 DIRS = intern
-
+CFLAGS += -DWITH_MOD_BOOLEAN -DWITH_MOD_BOOLEAN
 include nan_subdirs.mk

source/blender/modifiers/SConscript

@@ -12,6 +12,10 @@ incs += ' ' + env['BF_ZLIB_INC']
 
 defs = []
 
+# could be made optional
+defs += ['WITH_MOD_BOOLEAN']
+defs += ['WITH_MOD_DECIMATE']
+
 if env['BF_NO_ELBEEM']:
     defs.append('DISABLE_ELBEEM')
 

source/blender/modifiers/intern/MOD_boolean.c

@@ -82,7 +82,7 @@ static void updateDepgraph(ModifierData *md, DagForest *forest,
 	}
 }
 
-
+#ifdef WITH_MOD_BOOLEAN
 static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 						DerivedMesh *derivedData,
 						int UNUSED(useRenderParams),
@@ -107,6 +107,15 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 	
 	return derivedData;
 }
+#else // WITH_MOD_BOOLEAN
+static DerivedMesh *applyModifier(ModifierData *UNUSED(md), Object *UNUSED(ob),
+						DerivedMesh *derivedData,
+						int UNUSED(useRenderParams),
+						int UNUSED(isFinalCalc))
+{
+	return derivedData;
+}
+#endif // WITH_MOD_BOOLEAN
 
 static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *UNUSED(md))
 {

source/blender/modifiers/intern/MOD_decimate.c

@@ -42,8 +42,9 @@
 
 #include "MEM_guardedalloc.h"
 
+#ifdef WITH_MOD_DECIMATE
 #include "LOD_decimation.h"
-
+#endif
 
 static void initData(ModifierData *md)
 {
@@ -60,6 +61,7 @@ static void copyData(ModifierData *md, ModifierData *target)
 	tdmd->percent = dmd->percent;
 }
 
+#ifdef WITH_MOD_DECIMATE
 static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
 						DerivedMesh *derivedData,
 						int UNUSED(useRenderParams),
@@ -176,7 +178,15 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
 exit:
 		return result;
 }
-
+#else // WITH_MOD_DECIMATE
+static DerivedMesh *applyModifier(ModifierData *UNUSED(md), Object *UNUSED(ob),
+						DerivedMesh *derivedData,
+						int UNUSED(useRenderParams),
+						int UNUSED(isFinalCalc))
+{
+	return derivedData;
+}
+#endif // WITH_MOD_DECIMATE
 
 ModifierTypeInfo modifierType_Decimate = {
 	/* name */              "Decimate",

source/creator/CMakeLists.txt

@@ -454,9 +454,9 @@ FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
 
 SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_render)
 
-IF(WITH_FLUID)
+IF(WITH_MOD_FLUID)
 	LIST(APPEND BLENDER_LINK_LIBS bf_intern_elbeem)
-ENDIF(WITH_FLUID)
+ENDIF(WITH_MOD_FLUID)
 
 
 #IF(UNIX)