Merge with trunk r37546
[blender-staging.git] / source / blender / blenkernel / CMakeLists.txt
index c7e4f20d7ad9bc46c7b3322d78b83c68c09b9845..8b6bca3805eb0d1cde081bd6e0897e7e75ee01ee 100644 (file)
@@ -44,6 +44,7 @@ set(INC
        ../editors/include
        ../render/extern/include
        ../../../intern/audaspace/intern
        ../editors/include
        ../render/extern/include
        ../../../intern/audaspace/intern
+       ../../../intern/ffmpeg
        ../../../intern/bsp/extern ../blenfont
        ../../../intern/decimation/extern
        ../../../intern/elbeem/extern
        ../../../intern/bsp/extern ../blenfont
        ../../../intern/decimation/extern
        ../../../intern/elbeem/extern
@@ -54,6 +55,9 @@ set(INC
        ../../../intern/smoke/extern
        ../../../intern/mikktspace
        ../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h
        ../../../intern/smoke/extern
        ../../../intern/mikktspace
        ../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
        ${ZLIB_INCLUDE_DIRS}
 )
        ${GLEW_INCLUDE_PATH}
        ${ZLIB_INCLUDE_DIRS}
 )
@@ -269,17 +273,19 @@ if(WITH_IMAGE_HDR)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-       list(APPEND INC ../quicktime ${QUICKTIME_INC})
+       list(APPEND INC ../quicktime)
+       list(APPEND INC_SYS ${QUICKTIME_INC})
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-       list(APPEND INC ${FFMPEG_INC})
+       list(APPEND INC_SYS ${FFMPEG_INC})
        add_definitions(-DWITH_FFMPEG)
 endif()
 
 if(WITH_PYTHON)
        add_definitions(-DWITH_FFMPEG)
 endif()
 
 if(WITH_PYTHON)
-       list(APPEND INC ../python ${PYTHON_INCLUDE_DIRS})
+       list(APPEND INC ../python)
+       list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
        add_definitions(-DWITH_PYTHON)
 
        if(WITH_PYTHON_SECURITY)
        add_definitions(-DWITH_PYTHON)
 
        if(WITH_PYTHON_SECURITY)
@@ -300,12 +306,12 @@ if(WITH_JACK)
 endif()
 
 if(WITH_LZO)
 endif()
 
 if(WITH_LZO)
-       list(APPEND INC ../../../extern/lzo/minilzo)
+       list(APPEND INC_SYS ../../../extern/lzo/minilzo)
        add_definitions(-DWITH_LZO)
 endif()
 
 if(WITH_LZMA)
        add_definitions(-DWITH_LZO)
 endif()
 
 if(WITH_LZMA)
-       list(APPEND INC ../../../extern/lzma)
+       list(APPEND INC_SYS ../../../extern/lzma)
        add_definitions(-DWITH_LZMA)
 endif()
 
        add_definitions(-DWITH_LZMA)
 endif()
 
@@ -313,4 +319,4 @@ if(MSVC)
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
 endif()
 
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
 endif()
 
-blender_add_lib(bf_blenkernel "${SRC}" "${INC}")
+blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}")