Merged changes in the trunk up to revision 32684.
[blender.git] / source / blender / makesrna / intern / CMakeLists.txt
index 0df9ce877cb219ece0b940d350d6260f186da972..50704b4c45a9f23bb764b1405f1883879883c7e7 100644 (file)
@@ -24,8 +24,8 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-# this warning on generated files gets annoying
-STRING(REGEX REPLACE "-Wunused-parameter" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
+# Generated code has some unused vars we can ignore.
+REMOVE_STRICT_FLAGS()
 
 FILE(GLOB DEFSRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.c")
 FILE(GLOB APISRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*_api.c")
@@ -113,9 +113,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)