[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21326] branches/blender2.5/blender/source /blender: cmake support for building without fluidsim

[Campbell Barton]

Revision: 21326
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21326
Author:   campbellbarton
Date:     2009-07-03 00:22:35 +0200 (Fri, 03 Jul 2009)

Log Message:
-----------
cmake support for building without fluidsim

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
    branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_fluidsim.c

Modified: branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/editors/CMakeLists.txt	2009-07-02 22:12:26 UTC (rev 21325)
+++ branches/blender2.5/blender/source/blender/editors/CMakeLists.txt	2009-07-02 22:22:35 UTC (rev 21326)
@@ -64,6 +64,10 @@
   ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
+IF(NOT WITH_ELBEEM)
+  ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+ENDIF(NOT WITH_ELBEEM)
+
 IF(WITH_PYTHON)
   SET(INC ${INC} ${PYTHON_INC})
 ELSE(WITH_PYTHON)

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt	2009-07-02 22:12:26 UTC (rev 21325)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt	2009-07-02 22:22:35 UTC (rev 21326)
@@ -62,6 +62,10 @@
   ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
+IF(NOT WITH_ELBEEM)
+  ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+ENDIF(NOT WITH_ELBEEM)
+
 # Build makesrna executable
 ADD_EXECUTABLE(makesrna ${SRC} ${INC_FILES})
 TARGET_LINK_LIBRARIES(makesrna bf_dna)

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_fluidsim.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_fluidsim.c	2009-07-02 22:12:26 UTC (rev 21325)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_fluidsim.c	2009-07-02 22:22:35 UTC (rev 21326)
@@ -130,10 +130,14 @@
 
 static void rna_DomainFluidSettings_memory_estimate_get(PointerRNA *ptr, char *value)
 {
+#ifdef DISABLE_ELBEEM
+	value[0]= '\0';
+#else
 	Object *ob= (Object*)ptr->id.data;
 	FluidsimSettings *fss= (FluidsimSettings*)ptr->data;
 
 	fluid_estimate_memory(ob, fss, value);
+#endif
 }
 
 static int rna_DomainFluidSettings_memory_estimate_length(PointerRNA *ptr)