svn merge -r37028:37030 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / blender / blenkernel / CMakeLists.txt
index 55a0ced673a1e07e45a00fcd81a5f82c87b7a3f9..84f8ea42bd164e8675a6165052e62b34fdcbdf4e 100644 (file)
@@ -56,6 +56,9 @@ set(INC
        ../../../intern/smoke/extern
        ../../../intern/mikktspace
        ../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
        ${ZLIB_INCLUDE_DIRS}
 )
@@ -272,17 +275,19 @@ if(WITH_IMAGE_HDR)
 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)
-       list(APPEND INC ${FFMPEG_INC})
+       list(APPEND INC_SYS ${FFMPEG_INC})
        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)
@@ -303,12 +308,12 @@ if(WITH_JACK)
 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)
-       list(APPEND INC ../../../extern/lzma)
+       list(APPEND INC_SYS ../../../extern/lzma)
        add_definitions(-DWITH_LZMA)
 endif()
 
@@ -316,4 +321,4 @@ if(MSVC)
        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}")