svn merge -r37700:37800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / makesrna / intern / CMakeLists.txt
index 350ca9f6bae2b42207c72482c64a3eb477b0f99e..3997f6a84e05292f7d54fbc4b4e119672e5c553b 100644 (file)
@@ -131,8 +131,14 @@ set(SRC
 )
 
 set(INC
+
+)
+
+set(INC_SYS
+
 )
 
+
 if(WITH_PYTHON)
        add_definitions(-DWITH_PYTHON)
 endif()
@@ -165,21 +171,20 @@ if(WITH_IMAGE_HDR)
        add_definitions(-DWITH_HDR)
 endif()
 
+if(WITH_AUDASPACE)
+       add_definitions(-DWITH_AUDASPACE)
+endif()
+
 if(WITH_CODEC_QUICKTIME)
        list(APPEND INC ../../quicktime)
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-       list(APPEND INC ${FFMPEG_INC})
+       list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
        add_definitions(-DWITH_FFMPEG)
 endif()
 
-if(WITH_LCMS)
-       list(APPEND INC ${LCMS_INCLUDE_DIR})
-       add_definitions(-DWITH_LCMS)
-endif()
-
 if(NOT WITH_MOD_FLUID)
        add_definitions(-DDISABLE_ELBEEM)
 endif()
@@ -211,6 +216,7 @@ blender_include_dirs(
        ../../blenkernel
        ../../blenloader
        ../../blenlib
+       ../../bmesh
        ../../blenfont
        ../../gpu
        ../../imbuf
@@ -222,6 +228,9 @@ blender_include_dirs(
        ../../../../intern/audaspace/intern
        ../../../../intern/guardedalloc
        ../../../../intern/memutil
+)
+
+blender_include_dirs_sys(
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -247,4 +256,4 @@ set(SRC
        rna_nodetree_types.h
 )
 
-blender_add_lib(bf_rna "${SRC}" "${INC}")
+blender_add_lib(bf_rna "${SRC}" "${INC}" "${INC_SYS}")