Merged changes in the trunk up to revision 31190.
[blender.git] / source / blender / blenkernel / CMakeLists.txt
index 195dfe2ea70d5f95f224990c41e00e843d0a9de3..af75ef1dbf6160aa16ccd8215dfbbb46b5d2dfc0 100644 (file)
@@ -46,21 +46,29 @@ IF(WITH_BULLET)
        ADD_DEFINITIONS(-DUSE_BULLET)
 ENDIF(WITH_BULLET)
 
-IF(WITH_OPENEXR)
+IF(WITH_IMAGE_OPENEXR)
        ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
+ENDIF(WITH_IMAGE_OPENEXR)
 
-IF(WITH_TIFF)
+IF(WITH_IMAGE_TIFF)
        ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
+ENDIF(WITH_IMAGE_TIFF)
 
-IF(WITH_OPENJPEG)
+IF(WITH_IMAGE_OPENJPEG)
        ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
+ENDIF(WITH_IMAGE_OPENJPEG)
 
-IF(WITH_DDS)
+IF(WITH_IMAGE_DDS)
        ADD_DEFINITIONS(-DWITH_DDS)
-ENDIF(WITH_DDS)
+ENDIF(WITH_IMAGE_DDS)
+
+IF(WITH_IMAGE_CINEON)
+       ADD_DEFINITIONS(-DWITH_CINEON)
+ENDIF(WITH_IMAGE_CINEON)
+
+IF(WITH_IMAGE_HDR)
+       ADD_DEFINITIONS(-DWITH_HDR)
+ENDIF(WITH_IMAGE_HDR)
 
 IF(WITH_QUICKTIME)
        SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
@@ -87,9 +95,9 @@ IF(WITH_OPENMP)
                ADD_DEFINITIONS(-DPARALLEL=1)
 ENDIF(WITH_OPENMP)
 
-IF(NOT WITH_ELBEEM)
+IF(NOT WITH_FLUID)
        ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
+ENDIF(NOT WITH_FLUID)
 
 IF(WITH_LZO)
        SET(INC ${INC} ../../../extern/lzo/minilzo)