cmake maintenance

blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python). also only build wm_apple.c on apple+carbon configuration.
author: Campbell Barton <ideasman42@gmail.com> 2011-05-31 05:15:44 +0400
committer: Campbell Barton <ideasman42@gmail.com> 2011-05-31 05:15:44 +0400
commit: 09da9d43931a09e3786343e724a3de7217285d0d (patch)
tree: 4c48fbd4404687fd04254d071d535499a1ae4058
parent: dcd55cef86270f076cf827c5ae7a6cc76db4f9ad (diff)
102 files changed, 593 insertions, 228 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 6e4aaa51a49..265d5072205 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -13,6 +13,15 @@ macro(blender_include_dirs
 	include_directories(${all_incs})
 endmacro()
 
+macro(blender_include_dirs_sys
+	includes)
+
+	foreach(inc ${ARGV})
+		get_filename_component(abs_inc ${inc} ABSOLUTE)
+		list(APPEND all_incs ${abs_inc})
+	endforeach()
+	include_directories(SYSTEM ${all_incs})
+endmacro()
 
 macro(blender_source_group
 	sources)
@@ -35,12 +44,15 @@ endmacro()
 macro(blender_add_lib_nolist
 	name
 	sources
-	includes)
+	includes
+	includes_sys)
 
 	# message(STATUS "Configuring library ${name}")
 
 	# include_directories(${includes})
+	# include_directories(SYSTEM ${includes_sys})
 	blender_include_dirs("${includes}")
+	blender_include_dirs_sys("${includes_sys}")
 
 	add_library(${name} ${sources})
 
@@ -54,9 +66,10 @@ endmacro()
 macro(blender_add_lib
 	name
 	sources
-	includes)
+	includes
+	includes_sys)
 
-	blender_add_lib_nolist(${name} "${sources}" "${includes}")
+	blender_add_lib_nolist(${name} "${sources}" "${includes}" "${includes_sys}")
 
 	set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
 endmacro()
diff --git a/extern/binreloc/CMakeLists.txt b/extern/binreloc/CMakeLists.txt
index e3f0b05d563..a4f85a2fdfd 100644
--- a/extern/binreloc/CMakeLists.txt
+++ b/extern/binreloc/CMakeLists.txt
@@ -18,17 +18,21 @@
 # All rights reserved.
 #
 
+set(INC
+	./include
+)
+
+set(INC_SYS
+
+)
+
 set(SRC
 	binreloc.c
 
 	include/binreloc.h
 )
 
-set(INC
-	./include
-)
-
 add_definitions(-DENABLE_BINRELOC)
 
 
-blender_add_lib(extern_binreloc "${SRC}" "${INC}")
+blender_add_lib(extern_binreloc "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt
index a9137dd33f7..bfc4b31689e 100644
--- a/extern/bullet2/CMakeLists.txt
+++ b/extern/bullet2/CMakeLists.txt
@@ -29,6 +29,10 @@ set(INC
 	src
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
 	src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp
@@ -145,7 +149,6 @@ set(SRC
 	src/LinearMath/btGeometryUtil.cpp
 	src/LinearMath/btQuickprof.cpp
 	src/LinearMath/btSerializer.cpp
-	
 
 	src/Bullet-C-Api.h
 	src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
@@ -330,4 +333,4 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 endif()
 
-blender_add_lib(extern_bullet "${SRC}" "${INC}")
+blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/glew/CMakeLists.txt b/extern/glew/CMakeLists.txt
index 1a20dbdb9d7..35beacab6a3 100644
--- a/extern/glew/CMakeLists.txt
+++ b/extern/glew/CMakeLists.txt
@@ -28,8 +28,12 @@ set(INC
 	./include
 )
 
+set(INC_SYS
+
+)
+
 if(UNIX)
-	list(APPEND INC ${X11_X11_INCLUDE_PATH})
+	list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH})
 endif()
 
 set(SRC
@@ -42,4 +46,4 @@ set(SRC
 
 add_definitions(-DGLEW_STATIC)
 
-blender_add_lib(extern_glew "${SRC}" "${INC}")
+blender_add_lib(extern_glew "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/libopenjpeg/CMakeLists.txt b/extern/libopenjpeg/CMakeLists.txt
index c5ba1363246..fe03db83054 100644
--- a/extern/libopenjpeg/CMakeLists.txt
+++ b/extern/libopenjpeg/CMakeLists.txt
@@ -28,6 +28,10 @@ set(INC
 	.
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	bio.c
 	cio.c
@@ -73,4 +77,4 @@ set(SRC
 	tgt.h
 )
 
-blender_add_lib(extern_openjpeg "${SRC}" "${INC}")
+blender_add_lib(extern_openjpeg "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/libredcode/CMakeLists.txt b/extern/libredcode/CMakeLists.txt
index 20ad6ae9f7d..1c4daac42d1 100644
--- a/extern/libredcode/CMakeLists.txt
+++ b/extern/libredcode/CMakeLists.txt
@@ -26,6 +26,9 @@
 
 set(INC
 	.
+)
+
+set(INC_SYS
 	../libopenjpeg
 )
 
@@ -39,4 +42,4 @@ set(SRC
 	format.h
 )
 
-blender_add_lib(extern_redcode "${SRC}" "${INC}")
+blender_add_lib(extern_redcode "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/lzma/CMakeLists.txt b/extern/lzma/CMakeLists.txt
index 710165d2496..bfb52591e08 100644
--- a/extern/lzma/CMakeLists.txt
+++ b/extern/lzma/CMakeLists.txt
@@ -28,6 +28,10 @@ set(INC
 	.
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	Alloc.c
 	LzFind.c
@@ -44,4 +48,4 @@ set(SRC
 	Types.h
 )
 
-blender_add_lib(extern_lzma "${SRC}" "${INC}")
+blender_add_lib(extern_lzma "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/lzo/CMakeLists.txt b/extern/lzo/CMakeLists.txt
index 17728aad43e..10ea2c58f7c 100644
--- a/extern/lzo/CMakeLists.txt
+++ b/extern/lzo/CMakeLists.txt
@@ -28,6 +28,10 @@ set(INC
 	include
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	minilzo/minilzo.c
 
@@ -36,4 +40,4 @@ set(SRC
 	minilzo/minilzo.h
 )
 
-blender_add_lib(extern_minilzo "${SRC}" "${INC}")
+blender_add_lib(extern_minilzo "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt
index a2468d0071e..0aac2612886 100644
--- a/intern/audaspace/CMakeLists.txt
+++ b/intern/audaspace/CMakeLists.txt
@@ -23,12 +23,15 @@
 set(INC
 	.
 	intern
-	FX SRC
-	${PTHREADS_INC}
-	${LIBSAMPLERATE_INC}
+	FX
+	SRC
 	../ffmpeg
 )
 
+set(INC_SYS
+	${PTHREADS_INC}
+)
+
 set(SRC
 	FX/AUD_AccumulatorFactory.cpp
 	FX/AUD_BaseIIRFilterReader.cpp
@@ -156,8 +159,9 @@ set(SRC
 
 if(WITH_CODEC_FFMPEG)
 	add_definitions(-DWITH_FFMPEG)
-	list(APPEND INC ffmpeg ${FFMPEG_INC})
-	set(FFMPEGSRC
+	list(APPEND INC ffmpeg)
+	list(APPEND INC_SYS ${FFMPEG_INC})
+	list(APPEND SRC
 		ffmpeg/AUD_FFMPEGFactory.cpp
 		ffmpeg/AUD_FFMPEGReader.cpp
 
@@ -168,8 +172,9 @@ endif()
 
 if(WITH_SDL)
 	add_definitions(-DWITH_SDL)
-	list(APPEND INC SDL ${SDL_INCLUDE_DIR})
-	set(SDLSRC
+	list(APPEND INC SDL)
+	list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
+	list(APPEND SRC
 		SDL/AUD_SDLDevice.cpp
 
 		SDL/AUD_SDLDevice.h
@@ -178,18 +183,20 @@ endif()
 
 if(WITH_OPENAL)
 	add_definitions(-DWITH_OPENAL)
-	list(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR})
-	set(OPENALSRC
+	list(APPEND INC OpenAL)
+	list(APPEND INC_SYS ${OPENAL_INCLUDE_DIR})
+	list(APPEND SRC
 		OpenAL/AUD_OpenALDevice.cpp
 
 		OpenAL/AUD_OpenALDevice.h
-	)	
+	)
 endif()
 
 if(WITH_JACK)
 	add_definitions(-DWITH_JACK)
-	list(APPEND INC jack ${JACK_INC})
-	set(JACKSRC
+	list(APPEND INC jack)
+	list(APPEND INC_SYS ${JACK_INC})
+	list(APPEND SRC
 		jack/AUD_JackDevice.cpp
 
 		jack/AUD_JackDevice.h
@@ -198,7 +205,8 @@ endif()
 
 if(WITH_CODEC_SNDFILE)
 	add_definitions(-DWITH_SNDFILE)
-	list(APPEND INC sndfile ${SNDFILE_INC})
+	list(APPEND INC sndfile)
+	list(APPEND INC_SYS ${SNDFILE_INC})
 	set(SNDFILESRC
 		sndfile/AUD_SndFileFactory.cpp
 		sndfile/AUD_SndFileReader.cpp
@@ -210,7 +218,8 @@ endif()
 
 if(WITH_SAMPLERATE)
 	add_definitions(-DWITH_SAMPLERATE)
-	set(SRCFILESRC
+	list(APPEND INC_SYS ${LIBSAMPLERATE_INC})
+	list(APPEND SRC
 		SRC/AUD_SRCResampleFactory.cpp
 		SRC/AUD_SRCResampleReader.cpp
 
@@ -221,8 +230,9 @@ endif()
 
 if(WITH_FFTW3 AND FALSE)
 	add_definitions(-DWITH_FFTW3)
-	list(APPEND INC fftw ${FFTW3_INC})
-	set(FFTW3SRC
+	list(APPEND INC fftw)
+	list(APPEND INC_SYS ${FFTW3_INC})
+	list(APPEND SRC
 		fftw/AUD_BandPassFactory.cpp
 		fftw/AUD_BandPassReader.cpp
 
@@ -232,8 +242,9 @@ if(WITH_FFTW3 AND FALSE)
 endif()
 
 if(WITH_PYTHON)
-	list(APPEND INC Python ${PYTHON_INCLUDE_DIRS})
-	set(PYTHONSRC
+	list(APPEND INC Python)
+	list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
+	list(APPEND SRC
 		Python/AUD_PyAPI.cpp
 
 		Python/AUD_PyAPI.h
@@ -241,16 +252,4 @@ if(WITH_PYTHON)
 	add_definitions(-DWITH_PYTHON)
 endif()
 
-set(SRC
-	${SRC}
-	${FFMPEGSRC}
-	${SNDFILESRC}
-	${SRCFILESRC}
-	${FFTW3SRC}
-	${SDLSRC}
-	${OPENALSRC}
-	${JACKSRC}
-	${PYTHONSRC}
-)
-
-blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}")
+blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/boolop/CMakeLists.txt b/intern/boolop/CMakeLists.txt
index 7e36f255268..7a95d556172 100644
--- a/intern/boolop/CMakeLists.txt
+++ b/intern/boolop/CMakeLists.txt
@@ -36,6 +36,10 @@ set(INC
 	../../source/blender/makesdna
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/BOP_BBox.cpp
 	intern/BOP_BSPNode.cpp
@@ -75,4 +79,4 @@ set(SRC
 	intern/BOP_Vertex.h
 )
 
-blender_add_lib(bf_intern_bop "${SRC}" "${INC}")
+blender_add_lib(bf_intern_bop "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/bsp/CMakeLists.txt b/intern/bsp/CMakeLists.txt
index 9f281586867..792f6aa1327 100644
--- a/intern/bsp/CMakeLists.txt
+++ b/intern/bsp/CMakeLists.txt
@@ -32,6 +32,10 @@ set(INC
 	../memutil
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/BSP_CSGMesh.cpp
 	intern/BSP_MeshPrimitives.cpp
@@ -44,4 +48,4 @@ set(SRC
 	intern/BSP_MeshPrimitives.h
 )
 
-blender_add_lib(bf_intern_bsp "${SRC}" "${INC}")
+blender_add_lib(bf_intern_bsp "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/container/CMakeLists.txt b/intern/container/CMakeLists.txt
index 7e83acf68ce..42c8de6a08e 100644
--- a/intern/container/CMakeLists.txt
+++ b/intern/container/CMakeLists.txt
@@ -29,6 +29,10 @@ set(INC
 	../guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/CTR_List.cpp
 
@@ -40,4 +44,4 @@ set(SRC
 	CTR_UHeap.h
 )
 
-blender_add_lib(bf_intern_ctr "${SRC}" "${INC}")
+blender_add_lib(bf_intern_ctr "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/decimation/CMakeLists.txt b/intern/decimation/CMakeLists.txt
index 6f9137b7189..53ba92e416b 100644
--- a/intern/decimation/CMakeLists.txt
+++ b/intern/decimation/CMakeLists.txt
@@ -32,6 +32,10 @@ set(INC
 	../moto/include
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/LOD_EdgeCollapser.cpp
 	intern/LOD_ExternNormalEditor.cpp
@@ -57,4 +61,4 @@ set(SRC
 	intern/LOD_QuadricEditor.h
 )
 
-blender_add_lib(bf_intern_decimate "${SRC}" "${INC}")
+blender_add_lib(bf_intern_decimate "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt
index dd23e854a25..7a842a29b98 100644
--- a/intern/elbeem/CMakeLists.txt
+++ b/intern/elbeem/CMakeLists.txt
@@ -26,6 +26,9 @@
 
 set(INC
 	extern
+)
+
+set(INC_SYS
 	${PNG_INCLUDE_DIR}
 	${ZLIB_INCLUDE_DIRS}
 )
@@ -88,11 +91,11 @@ set(SRC
 
 add_definitions(-DNOGUI -DELBEEM_BLENDER=1)
 if(WINDOWS)
-		add_definitions(-DUSE_MSVC6FIXES)
+	add_definitions(-DUSE_MSVC6FIXES)
 endif()
 
 if(WITH_OPENMP)
-		add_definitions(-DPARALLEL=1)
+	add_definitions(-DPARALLEL=1)
 endif()
 
-blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}")
+blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index d42be400dff..065aa68dd3d 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -29,6 +29,9 @@ set(INC
 	../string
 	../../source/blender/imbuf
 	../../source/blender/makesdna
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -123,7 +126,7 @@ elseif(UNIX)
 		add_definitions(-DWITH_X11_XINPUT)
 	endif()
 
-	list(APPEND INC ${X11_X11_INCLUDE_PATH})
+	list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH})
 
 	list(APPEND SRC
 		intern/GHOST_DisplayManagerX11.cpp
@@ -143,7 +146,7 @@ elseif(UNIX)
 
 	if(X11_XF86keysym_INCLUDE_PATH)
 		add_definitions(-DWITH_XF86KEYSYM)
-		list(APPEND INC ${X11_XF86keysym_INCLUDE_PATH})
+		list(APPEND INC_SYS ${X11_XF86keysym_INCLUDE_PATH})
 	endif()
 
 elseif(WIN32)
@@ -151,7 +154,7 @@ elseif(WIN32)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
 	endif()
 
-	list(APPEND INC ${WINTAB_INC})
+	list(APPEND INC_SYS ${WINTAB_INC})
 
 	list(APPEND SRC
 		intern/GHOST_DisplayManagerWin32.cpp
@@ -169,5 +172,5 @@ elseif(WIN32)
 	)
 endif()
 
-blender_add_lib(bf_intern_ghost "${SRC}" "${INC}")
+blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}")
 
diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt
index 4a534d94eb8..b3fe29af570 100644
--- a/intern/guardedalloc/CMakeLists.txt
+++ b/intern/guardedalloc/CMakeLists.txt
@@ -24,7 +24,13 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-set(INC .)
+set(INC
+	.
+)
+
+set(INC_SYS
+
+)
 
 set(SRC
 	./intern/mallocn.c
@@ -41,12 +47,12 @@ if(WIN32 AND NOT UNIX)
 	)
 endif()
 
-blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}")
+blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}" "${INC_SYS}")
 
 # Override C++ alloc, optional.
 if(WITH_CXX_GUARDEDALLOC)
 	set(SRC
 		cpp/mallocn.cpp
 	)
-	blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}")
+	blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}" "${INC_SYS}")
 endif()
diff --git a/intern/iksolver/CMakeLists.txt b/intern/iksolver/CMakeLists.txt
index 46be310b7ec..5a7c0978599 100644
--- a/intern/iksolver/CMakeLists.txt
+++ b/intern/iksolver/CMakeLists.txt
@@ -30,6 +30,10 @@ set(INC
 	../moto/include
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/IK_QJacobian.cpp
 	intern/IK_QJacobianSolver.cpp
@@ -70,4 +74,4 @@ set(SRC
 	intern/TNT/version.h
 )
 
-blender_add_lib(bf_intern_ik "${SRC}" "${INC}")
+blender_add_lib(bf_intern_ik "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt
index a0489c48144..26b61f5c6ce 100644
--- a/intern/itasc/CMakeLists.txt
+++ b/intern/itasc/CMakeLists.txt
@@ -28,6 +28,10 @@ set(INC
 	../../extern/Eigen2
 )
 
+set(INC_SYS
+	
+)
+
 set(SRC
 	Armature.cpp
 	Cache.cpp
@@ -222,4 +226,4 @@ set(SRC
 	../../extern/Eigen2/Eigen/src/Sparse/UmfPackSupport.h
 )
 
-blender_add_lib(bf_intern_itasc "${SRC}" "${INC}")
+blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/memutil/CMakeLists.txt b/intern/memutil/CMakeLists.txt
index aecd3d5b6c9..54e43cb7236 100644
--- a/intern/memutil/CMakeLists.txt
+++ b/intern/memutil/CMakeLists.txt
@@ -29,6 +29,10 @@ set(INC
 	..
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/MEM_CacheLimiterC-Api.cpp
 	intern/MEM_RefCountedC-Api.cpp
@@ -43,4 +47,4 @@ set(SRC
 	MEM_SmartPtr.h
 )
 
-blender_add_lib(bf_intern_memutil "${SRC}" "${INC}")
+blender_add_lib(bf_intern_memutil "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/mikktspace/CMakeLists.txt b/intern/mikktspace/CMakeLists.txt
index f84a499206c..b6552b18e37 100644
--- a/intern/mikktspace/CMakeLists.txt
+++ b/intern/mikktspace/CMakeLists.txt
@@ -28,11 +28,15 @@ set(INC
 	.
 )
 
+set(INC_SYS
+	
+)
+
 set(SRC
 	mikktspace.c
 
 	mikktspace.h
 )
 
-blender_add_lib(bf_intern_mikktspace "${SRC}" "${INC}")
+blender_add_lib(bf_intern_mikktspace "${SRC}" "${INC}" "${INC_SYS}")
 
diff --git a/intern/moto/CMakeLists.txt b/intern/moto/CMakeLists.txt
index b9fd8986268..1e73f960907 100644
--- a/intern/moto/CMakeLists.txt
+++ b/intern/moto/CMakeLists.txt
@@ -28,6 +28,10 @@ set(INC
 	include
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/MT_Assert.cpp
 	intern/MT_CmMatrix4x4.cpp
@@ -67,4 +71,4 @@ set(SRC
 	include/NM_Scalar.h
 )
 
-blender_add_lib(bf_intern_moto "${SRC}" "${INC}")
+blender_add_lib(bf_intern_moto "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/opennl/CMakeLists.txt b/intern/opennl/CMakeLists.txt
index 699d2dec795..55b0bc5855f 100644
--- a/intern/opennl/CMakeLists.txt
+++ b/intern/opennl/CMakeLists.txt
@@ -36,6 +36,10 @@ set(INC
 	superlu
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/opennl.c
 	superlu/colamd.c
@@ -79,4 +83,4 @@ set(SRC
 	superlu/util.h
 )
 
-blender_add_lib(bf_intern_opennl "${SRC}" "${INC}")
+blender_add_lib(bf_intern_opennl "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt
index 486ef92f638..c787f54b284 100644
--- a/intern/smoke/CMakeLists.txt
+++ b/intern/smoke/CMakeLists.txt
@@ -28,6 +28,9 @@ set(INC
 	intern
 	../memutil
 	../../extern/bullet2/src
+)
+
+set(INC_SYS
 	${PNG_INCLUDE_DIR}
 	${ZLIB_INCLUDE_DIRS}
 )
@@ -89,5 +92,5 @@ if(WITH_FFTW3)
 	list(APPEND INC ${FFTW3_INC})
 endif()
 
-blender_add_lib(bf_intern_smoke "${SRC}" "${INC}")
+blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}")
 
diff --git a/intern/string/CMakeLists.txt b/intern/string/CMakeLists.txt
index 60796185e70..28bd198d29f 100644
--- a/intern/string/CMakeLists.txt
+++ b/intern/string/CMakeLists.txt
@@ -28,6 +28,10 @@ set(INC
 	.
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/STR_String.cpp
 
@@ -35,4 +39,4 @@ set(SRC
 	STR_String.h
 )
 
-blender_add_lib(bf_intern_string "${SRC}" "${INC}")
+blender_add_lib(bf_intern_string "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/avi/CMakeLists.txt b/source/blender/avi/CMakeLists.txt
index 77a43e5560e..b62e0cc5afd 100644
--- a/source/blender/avi/CMakeLists.txt
+++ b/source/blender/avi/CMakeLists.txt
@@ -27,6 +27,9 @@
 set(INC 
 	.
 	../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${JPEG_INCLUDE_DIR}
 )
 
@@ -47,4 +50,4 @@ set(SRC
 	intern/rgb32.h
 )
 
-blender_add_lib(bf_avi "${SRC}" "${INC}")
+blender_add_lib(bf_avi "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt
index 48ee4aed033..b915764c1bb 100644
--- a/source/blender/blenfont/CMakeLists.txt
+++ b/source/blender/blenfont/CMakeLists.txt
@@ -29,6 +29,9 @@ set(INC
 	../editors/include
 	../blenkernel
 	../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 	${FREETYPE_INCLUDE_DIRS}
 )
@@ -47,7 +50,7 @@ set(SRC
 )
 
 if(WITH_INTERNATIONAL)
-	list(APPEND INC ${GETTEXT_INC})
+	list(APPEND INC_SYS ${GETTEXT_INC})
 	add_definitions(-DINTERNATIONAL)
 endif()
 
@@ -55,5 +58,5 @@ if(WIN32 AND NOT UNIX)
 	add_definitions(-DUSE_GETTEXT_DLL)
 endif()
 
-blender_add_lib(bf_blenfont "${SRC}" "${INC}")
+blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}")
 
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 44d20b6c651..5078657588d 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -55,6 +55,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}
 )
@@ -269,17 +272,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)
@@ -300,12 +305,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()
 
@@ -313,4 +318,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}")
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index b7827d62851..0c25da325ad 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -32,6 +32,9 @@ set(INC
 	../gpu
 	../../../intern/ghost
 	../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${ZLIB_INCLUDE_DIRS}
 	${FREETYPE_INCLUDE_DIRS}
 )
@@ -134,12 +137,12 @@ set(SRC
 )
 
 if(WITH_BINRELOC)
+	list(APPEND INC_SYS "${BINRELOC_INC}")
 	add_definitions(-DWITH_BINRELOC)
-	list(APPEND INC "${BINRELOC_INC}")
 endif()
 
 if(WITH_OPENMP)
 	add_definitions(-DPARALLEL=1)
 endif()
 
-blender_add_lib(bf_blenlib "${SRC}" "${INC}")
+blender_add_lib(bf_blenlib "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index 888cf3148e3..312a6546e22 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -32,6 +32,9 @@ set(INC
 	../makesrna
 	../render/extern/include
 	../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${ZLIB_INCLUDE_DIRS}
 )
 
@@ -55,4 +58,4 @@ if(WITH_BUILDINFO)
 	add_definitions(-DNAN_BUILDINFO)
 endif()
 
-blender_add_lib(bf_blenloader "${SRC}" "${INC}")
+blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/blenpluginapi/CMakeLists.txt
index 1e3a3398861..c3aad25ccbe 100644
--- a/source/blender/blenpluginapi/CMakeLists.txt
+++ b/source/blender/blenpluginapi/CMakeLists.txt
@@ -34,6 +34,10 @@ set(INC
 	../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/pluginapi.c
 
@@ -46,8 +50,8 @@ set(SRC
 )
 
 if(WITH_CODEC_QUICKTIME)
-	list(APPEND INC ${QUICKTIME_INC})
+	list(APPEND INC_SYS ${QUICKTIME_INC})
 	add_definitions(-DWITH_QUICKTIME)
 endif()
 
-blender_add_lib(bf_blenpluginapi "${SRC}" "${INC}")
+blender_add_lib(bf_blenpluginapi "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt
index fa7bfee8ee5..a7e7c973f36 100644
--- a/source/blender/collada/CMakeLists.txt
+++ b/source/blender/collada/CMakeLists.txt
@@ -38,8 +38,12 @@ set(INC
 	../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 if(APPLE)
-	list(APPEND INC
+	list(APPEND INC_SYS
 		${OPENCOLLADA_INC}/COLLADAStreamWriter
 		${OPENCOLLADA_INC}/COLLADABaseUtils
 		${OPENCOLLADA_INC}/COLLADAFramework
@@ -47,7 +51,7 @@ if(APPLE)
 		${OPENCOLLADA_INC}/GeneratedSaxParser 
 	)
 else()
-	list(APPEND INC
+	list(APPEND INC_SYS
 		${OPENCOLLADA_INC}/COLLADAStreamWriter/include
 		${OPENCOLLADA_INC}/COLLADABaseUtils/include
 		${OPENCOLLADA_INC}/COLLADAFramework/include
@@ -111,4 +115,4 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 endif()
 
-blender_add_lib(bf_collada "${SRC}" "${INC}")
+blender_add_lib(bf_collada "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt
index 8fc1ec429cc..a3c1d035d9b 100644
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -28,6 +28,9 @@ set(INC
 	../../makesrna
 	../../windowmanager
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -51,4 +54,4 @@ set(SRC
 	anim_intern.h
 )
 
-blender_add_lib(bf_editor_animation "${SRC}" "${INC}")
+blender_add_lib(bf_editor_animation "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt
index 3234254f745..2db6e278460 100644
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -29,6 +29,9 @@ set(INC
 	../../windowmanager
 	../../../../intern/guardedalloc
 	../../../../intern/opennl/extern
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -52,4 +55,4 @@ set(SRC
 	reeb.h
 )
 
-blender_add_lib(bf_editor_armature "${SRC}" "${INC}")
+blender_add_lib(bf_editor_armature "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt
index a73fb9502a6..dfc7e336e84 100644
--- a/source/blender/editors/curve/CMakeLists.txt
+++ b/source/blender/editors/curve/CMakeLists.txt
@@ -30,6 +30,10 @@ set(INC
 	../../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	curve_ops.c
 	editcurve.c
@@ -39,4 +43,4 @@ set(SRC
 	curve_intern.h
 )
 
-blender_add_lib(bf_editor_curve "${SRC}" "${INC}")
+blender_add_lib(bf_editor_curve "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index a359b0ef6f5..8761297b979 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -19,7 +19,13 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-set(INC "")
+set(INC
+
+)
+
+set(INC_SYS
+
+)
 
 set(SRC
 	Bfont.c
@@ -60,4 +66,4 @@ set(SRC
 	vertexdraw.png.c
 )
 
-blender_add_lib(bf_editor_datafiles "${SRC}" "${INC}")
+blender_add_lib(bf_editor_datafiles "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt
index 71199ee9580..352960d285a 100644
--- a/source/blender/editors/gpencil/CMakeLists.txt
+++ b/source/blender/editors/gpencil/CMakeLists.txt
@@ -29,6 +29,9 @@ set(INC
 	../../makesrna
 	../../windowmanager
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -43,4 +46,4 @@ set(SRC
 	gpencil_intern.h
 )
 
-blender_add_lib(bf_editor_gpencil "${SRC}" "${INC}")
+blender_add_lib(bf_editor_gpencil "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index cf0c903e0a5..9902cac8857 100644
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -32,6 +32,9 @@ set(INC
 	../../python
 	../../windowmanager
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -64,4 +67,4 @@ if(WITH_PYTHON)
 	add_definitions(-DWITH_PYTHON)
 endif()
 
-blender_add_lib(bf_editor_interface "${SRC}" "${INC}")
+blender_add_lib(bf_editor_interface "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt
index a03bf173425..bd8789b9eef 100644
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -30,6 +30,9 @@ set(INC
 	../../windowmanager
 	../../render/extern/include
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -49,4 +52,4 @@ set(SRC
 	mesh_intern.h
 )
 
-blender_add_lib(bf_editor_mesh "${SRC}" "${INC}")
+blender_add_lib(bf_editor_mesh "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt
index af3d25699ed..690a8ec2fcb 100644
--- a/source/blender/editors/metaball/CMakeLists.txt
+++ b/source/blender/editors/metaball/CMakeLists.txt
@@ -31,6 +31,10 @@ set(INC
 	../../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	mball_edit.c
 	mball_ops.c
@@ -38,4 +42,4 @@ set(SRC
 	mball_intern.h
 )
 
-blender_add_lib(bf_editor_metaball "${SRC}" "${INC}")
+blender_add_lib(bf_editor_metaball "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index 47cb4d00938..4d50b78b7a1 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -35,6 +35,10 @@ set(INC
 	../../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	object_add.c
 	object_bake.c
@@ -58,4 +62,4 @@ if(WITH_PYTHON)
 	add_definitions(-DWITH_PYTHON)
 endif()
 
-blender_add_lib(bf_editor_object "${SRC}" "${INC}")
+blender_add_lib(bf_editor_object "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt
index 8d51d6eec37..1badccffe3b 100644
--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@@ -29,6 +29,9 @@ set(INC
 	../../windowmanager
 	../../../../intern/elbeem/extern
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -48,7 +51,7 @@ if(NOT WITH_MOD_FLUID)
 endif()
 
 if(WITH_OPENMP)
-		add_definitions(-DPARALLEL=1)
+	add_definitions(-DPARALLEL=1)
 endif()
 
-blender_add_lib(bf_editor_physics "${SRC}" "${INC}")
+blender_add_lib(bf_editor_physics "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt
index d04c75a2b48..c3bb6f457a2 100644
--- a/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@ -32,6 +32,9 @@ set(INC
 	../../render/extern/include
 	../../windowmanager
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -48,7 +51,8 @@ set(SRC
 )
 
 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()
 
@@ -56,4 +60,4 @@ if(WITH_OPENMP)
 	add_definitions(-DPARALLEL=1)
 endif()
 
-blender_add_lib(bf_editor_render "${SRC}" "${INC}")
+blender_add_lib(bf_editor_render "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt
index a583d753514..54341257692 100644
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -30,6 +30,9 @@ set(INC
 	../../makesrna
 	../../windowmanager
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -44,4 +47,4 @@ set(SRC
 	screen_intern.h
 )
 
-blender_add_lib(bf_editor_screen "${SRC}" "${INC}")
+blender_add_lib(bf_editor_screen "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt
index 248b6ea2b94..6ecbc9c5eec 100644
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -31,6 +31,9 @@ set(INC
 	../../windowmanager
 	../../render/extern/include
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -48,4 +51,4 @@ set(SRC
 	sculpt_intern.h
 )
 
-blender_add_lib(bf_editor_sculpt_paint "${SRC}" "${INC}")
+blender_add_lib(bf_editor_sculpt_paint "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt
index c2f7707309b..6a99971a5af 100644
--- a/source/blender/editors/sound/CMakeLists.txt
+++ b/source/blender/editors/sound/CMakeLists.txt
@@ -31,10 +31,14 @@ set(INC
 	../../../../intern/audaspace/intern
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	sound_ops.c
 
 	sound_intern.h
 )
 
-blender_add_lib(bf_editor_sound "${SRC}" "${INC}")
+blender_add_lib(bf_editor_sound "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt
index 7c52f4a9efb..6789556aa2b 100644
--- a/source/blender/editors/space_action/CMakeLists.txt
+++ b/source/blender/editors/space_action/CMakeLists.txt
@@ -28,6 +28,9 @@ set(INC
 	../../makesrna
 	../../windowmanager
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -41,4 +44,4 @@ set(SRC
 	action_intern.h
 )
 
-blender_add_lib(bf_editor_space_action "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_action "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt
index 22319dbb26e..c2dc2582c82 100644
--- a/source/blender/editors/space_api/CMakeLists.txt
+++ b/source/blender/editors/space_api/CMakeLists.txt
@@ -30,9 +30,13 @@ set(INC
 	../../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	space.c
 	spacetypes.c
 )
 
-blender_add_lib(bf_editor_space_api "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_api "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt
index e9670949cd5..0a4f251e46f 100644
--- a/source/blender/editors/space_buttons/CMakeLists.txt
+++ b/source/blender/editors/space_buttons/CMakeLists.txt
@@ -28,6 +28,9 @@ set(INC
 	../../makesrna
 	../../windowmanager
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -40,4 +43,4 @@ set(SRC
 	buttons_intern.h
 )
 
-blender_add_lib(bf_editor_space_buttons "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_buttons "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt
index 14e7f4a90d0..f89d782c7f2 100644
--- a/source/blender/editors/space_console/CMakeLists.txt
+++ b/source/blender/editors/space_console/CMakeLists.txt
@@ -29,6 +29,9 @@ set(INC
 	../../makesrna
 	../../windowmanager
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -44,4 +47,4 @@ if(WITH_PYTHON)
 	add_definitions(-DWITH_PYTHON)
 endif()
 
-blender_add_lib(bf_editor_space_console "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_console "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt
index 0a3bce76466..e161e2d4b9b 100644
--- a/source/blender/editors/space_file/CMakeLists.txt
+++ b/source/blender/editors/space_file/CMakeLists.txt
@@ -31,6 +31,9 @@ set(INC
 	../../windowmanager
 	../../render/extern/include
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -72,4 +75,4 @@ if(WITH_IMAGE_HDR)
 	add_definitions(-DWITH_HDR)
 endif()
 
-blender_add_lib(bf_editor_space_file "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_file "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt
index 59f2b22516d..f5548097db2 100644
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -29,6 +29,9 @@ set(INC
 	../../windowmanager
 	../../../../intern/guardedalloc
 	../../../../intern/audaspace/intern
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -44,4 +47,4 @@ set(SRC
 	graph_intern.h
 )
 
-blender_add_lib(bf_editor_space_graph "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_graph "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt
index 286f1f3178b..7c2d7ffb47b 100644
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -31,6 +31,9 @@ set(INC
 	../../windowmanager
 	../../render/extern/include
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -59,4 +62,4 @@ if(WITH_IMAGE_CINEON)
 	add_definitions(-DWITH_CINEON)
 endif()
 
-blender_add_lib(bf_editor_space_image "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_image "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt
index 16f4b2dedff..c6ed1b7bac7 100644
--- a/source/blender/editors/space_info/CMakeLists.txt
+++ b/source/blender/editors/space_info/CMakeLists.txt
@@ -30,6 +30,9 @@ set(INC
 	../../makesrna
 	../../windowmanager
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -45,4 +48,4 @@ set(SRC
 	textview.h
 )
 
-blender_add_lib(bf_editor_space_info "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_info "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_logic/CMakeLists.txt b/source/blender/editors/space_logic/CMakeLists.txt
index 6323ef779c2..cd24cb5e5d0 100644
--- a/source/blender/editors/space_logic/CMakeLists.txt
+++ b/source/blender/editors/space_logic/CMakeLists.txt
@@ -29,6 +29,9 @@ set(INC
 	../../windowmanager
 	../../editors/interface
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -45,4 +48,4 @@ if(WITH_GAMEENGINE)
 	add_definitions(-DWITH_GAMEENGINE)
 endif()
 
-blender_add_lib(bf_editor_space_logic "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_logic "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt
index 59ccb204d8c..1bf04f4dc37 100644
--- a/source/blender/editors/space_nla/CMakeLists.txt
+++ b/source/blender/editors/space_nla/CMakeLists.txt
@@ -28,6 +28,9 @@ set(INC
 	../../makesrna
 	../../windowmanager
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -43,4 +46,4 @@ set(SRC
 	nla_intern.h
 )
 
-blender_add_lib(bf_editor_space_nla "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_nla "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt
index 8604ba3baed..9172bc4e9eb 100644
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -33,6 +33,9 @@ set(INC
 	../../render/extern/include
 	../../../../intern/guardedalloc
 	../../../../intern/opennl/extern
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -50,4 +53,4 @@ set(SRC
 	node_intern.h
 )
 
-blender_add_lib(bf_editor_space_node "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_node "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt
index 871dec4dfc5..c05350c256f 100644
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -30,6 +30,9 @@ set(INC
 	../../windowmanager
 	../../../../intern/guardedalloc
 	../../../../intern/opennl/extern
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -41,4 +44,4 @@ set(SRC
 	outliner_intern.h
 )
 
-blender_add_lib(bf_editor_space_outliner "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_outliner "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt
index 974dc66e22c..1aed177eed1 100644
--- a/source/blender/editors/space_script/CMakeLists.txt
+++ b/source/blender/editors/space_script/CMakeLists.txt
@@ -28,6 +28,9 @@ set(INC
 	../../makesrna
 	../../windowmanager
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -41,8 +44,9 @@ set(SRC
 )
 
 if(WITH_PYTHON)
-	list(APPEND INC ${PYTHON_INCLUDE_DIRS} ../../python)
+	list(APPEND INC ../../python)
+	list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
 	add_definitions(-DWITH_PYTHON)
 endif()
 
-blender_add_lib(bf_editor_space_script "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_script "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt
index 9dc0b7a4258..d5f36719471 100644
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -30,6 +30,9 @@ set(INC
 	../../windowmanager
 	../../../../intern/guardedalloc
 	../../../../intern/audaspace/intern
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -46,4 +49,4 @@ set(SRC
 	sequencer_intern.h
 )
 
-blender_add_lib(bf_editor_space_sequencer "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_sequencer "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_sound/CMakeLists.txt b/source/blender/editors/space_sound/CMakeLists.txt
index 9e70d1dbda3..367d07c0c0b 100644
--- a/source/blender/editors/space_sound/CMakeLists.txt
+++ b/source/blender/editors/space_sound/CMakeLists.txt
@@ -28,6 +28,9 @@ set(INC
 	../../makesrna
 	../../windowmanager
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -38,4 +41,4 @@ set(SRC
 	sound_intern.h
 )
 
-blender_add_lib(bf_editor_space_sound "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_sound "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt
index 6241d397417..0c174225a58 100644
--- a/source/blender/editors/space_text/CMakeLists.txt
+++ b/source/blender/editors/space_text/CMakeLists.txt
@@ -29,6 +29,9 @@ set(INC
 	../../makesrna
 	../../windowmanager
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -43,8 +46,9 @@ set(SRC
 )
 
 if(WITH_PYTHON)
-	list(APPEND INC ${PYTHON_INCLUDE_DIRS} ../../python)
+	list(APPEND INC ../../python)
+	list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
 	add_definitions(-DWITH_PYTHON)
 endif()
 
-blender_add_lib(bf_editor_text "${SRC}" "${INC}")
+blender_add_lib(bf_editor_text "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_time/CMakeLists.txt b/source/blender/editors/space_time/CMakeLists.txt
index 654930fc95d..79081c7cfd4 100644
--- a/source/blender/editors/space_time/CMakeLists.txt
+++ b/source/blender/editors/space_time/CMakeLists.txt
@@ -28,6 +28,9 @@ set(INC
 	../../makesrna
 	../../windowmanager
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -38,4 +41,4 @@ set(SRC
 	time_intern.h
 )
 
-blender_add_lib(bf_editor_space_time "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_time "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt
index 68fe9d3e04c..656a5d2f0ef 100644
--- a/source/blender/editors/space_userpref/CMakeLists.txt
+++ b/source/blender/editors/space_userpref/CMakeLists.txt
@@ -30,6 +30,10 @@ set(INC
 	../../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	space_userpref.c
 	userpref_ops.c
@@ -37,4 +41,4 @@ set(SRC
 	userpref_intern.h
 )
 
-blender_add_lib(bf_editor_space_userpref "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_userpref "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index f923c578769..0a12a28af8d 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -33,6 +33,9 @@ set(INC
 	../../render/extern/include
 	../../../../intern/guardedalloc
 	../../../../intern/smoke/extern
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -64,4 +67,4 @@ endif()
 
 add_definitions(-DGLEW_STATIC)
 
-blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt
index 1455dc789c7..8eb8d538396 100644
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -28,6 +28,9 @@ set(INC
 	../../makesrna
 	../../windowmanager
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -46,4 +49,4 @@ set(SRC
 	transform.h
 )
 
-blender_add_lib(bf_editor_transform "${SRC}" "${INC}")
+blender_add_lib(bf_editor_transform "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index 0be6ccaee2c..8e5415945c7 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -30,6 +30,10 @@ set(INC
 	../../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	ed_util.c
 	editmode_undo.c
@@ -83,4 +87,4 @@ set(SRC
 	../include/UI_view2d.h
 )
 
-blender_add_lib(bf_editor_util "${SRC}" "${INC}")
+blender_add_lib(bf_editor_util "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt
index 60d730e8c52..11e1703d84c 100644
--- a/source/blender/editors/uvedit/CMakeLists.txt
+++ b/source/blender/editors/uvedit/CMakeLists.txt
@@ -29,6 +29,9 @@ set(INC
 	../../windowmanager
 	../../../../intern/guardedalloc
 	../../../../intern/opennl/extern
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -43,4 +46,4 @@ set(SRC
 	uvedit_parametrizer.h
 )
 
-blender_add_lib(bf_editor_uvedit "${SRC}" "${INC}")
+blender_add_lib(bf_editor_uvedit "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index d6e2b56c065..ce3150476f9 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -34,6 +34,9 @@ set(INC
 	../makesrna
 	../../../intern/guardedalloc
 	../../../intern/smoke/extern
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -55,5 +58,5 @@ set(SRC
 
 add_definitions(-DGLEW_STATIC)
 
-blender_add_lib(bf_gpu "${SRC}" "${INC}")
+blender_add_lib(bf_gpu "${SRC}" "${INC}" "${INC_SYS}")
 
diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt
index 47c773756a9..da5c2f69635 100644
--- a/source/blender/ikplugin/CMakeLists.txt
+++ b/source/blender/ikplugin/CMakeLists.txt
@@ -33,6 +33,10 @@ set(INC
 	../../../intern/iksolver/extern
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/ikplugin_api.c
 	intern/iksolver_plugin.c
@@ -45,11 +49,13 @@ set(SRC
 
 if(WITH_IK_ITASC)
 	add_definitions(-DWITH_IK_ITASC)
-	list(APPEND INC ../../../extern/Eigen2)
-	list(APPEND INC ../../../intern/itasc)
+	list(APPEND INC
+		../../../extern/Eigen2
+		../../../intern/itasc
+	)
 	list(APPEND SRC
-		./intern/itasc_plugin.cpp
+		intern/itasc_plugin.cpp
 	)
 endif()
 
-blender_add_lib(bf_ikplugin "${SRC}" "${INC}")
+blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index ed4508053b8..16bc7854617 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -39,6 +39,9 @@ set(INC
 	../../../intern/memutil
 	../../../intern/guardedalloc
 	../../../intern/ffmpeg
+)
+
+set(INC_SYS
 	${JPEG_INCLUDE_DIR}
 	${PNG_INCLUDE_DIR}
 	${ZLIB_INCLUDE_DIRS}
@@ -111,30 +114,28 @@ if(WITH_IMAGE_OPENEXR)
 endif()
 
 if(WITH_IMAGE_TIFF)
-	list(APPEND INC ${TIFF_INCLUDE_DIR})
+	list(APPEND INC_SYS ${TIFF_INCLUDE_DIR})
 	add_definitions(-DWITH_TIFF)
 endif()
 
 if(WITH_IMAGE_OPENJPEG)
-	list(APPEND INC ${OPENJPEG_INC})
+	list(APPEND INC_SYS ${OPENJPEG_INC})
 	add_definitions(-DWITH_OPENJPEG)
 endif()
 
 if(WITH_IMAGE_REDCODE)
-	list(APPEND INC ${REDCODE_INC})
+	list(APPEND INC_SYS ${REDCODE_INC})
 	add_definitions(-DWITH_REDCODE)
 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()
 
@@ -150,4 +151,4 @@ if(WITH_IMAGE_HDR)
 	add_definitions(-DWITH_HDR)
 endif()
 
-blender_add_lib(bf_imbuf "${SRC}" "${INC}")
+blender_add_lib(bf_imbuf "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt
index 92cba72c094..079f34af773 100644
--- a/source/blender/imbuf/intern/cineon/CMakeLists.txt
+++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt
@@ -25,14 +25,18 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC 
-		.
-		..
-		../..
-		../../../blenkernel
-		../../../blenloader
-		../../../blenlib
-		../../../makesdna
-		../../../../../intern/guardedalloc
+	.
+	..
+	../..
+	../../../blenkernel
+	../../../blenloader
+	../../../blenlib
+	../../../makesdna
+	../../../../../intern/guardedalloc
+)
+
+set(INC_SYS
+
 )
 
 set(SRC
@@ -44,4 +48,4 @@ set(SRC
 	logmemfile.c
 )
 
-blender_add_lib(bf_imbuf_cineon "${SRC}" "${INC}")
+blender_add_lib(bf_imbuf_cineon "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt
index 7564287ce4a..fd2b94547b4 100644
--- a/source/blender/imbuf/intern/dds/CMakeLists.txt
+++ b/source/blender/imbuf/intern/dds/CMakeLists.txt
@@ -28,13 +28,17 @@ set(INC
 	.
 	..
 	../..
-	./intern/include
+	intern/include
 	../../../blenlib
 	../../../blenkernel
 	../../../makesdna
 	../../../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	BlockDXT.cpp
 	ColorBlock.cpp
@@ -48,4 +52,4 @@ if(WITH_IMAGE_DDS)
 	add_definitions(-DWITH_DDS)
 endif()
 
-blender_add_lib(bf_imbuf_dds "${SRC}" "${INC}")                 
+blender_add_lib(bf_imbuf_dds "${SRC}" "${INC}" "${INC_SYS}")                 
diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt
index ace4f4f9a65..c1140bc59a9 100644
--- a/source/blender/imbuf/intern/openexr/CMakeLists.txt
+++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt
@@ -33,7 +33,10 @@ set(INC
 	intern/include
 	../../../../../intern/guardedalloc
 	../../../makesdna
-	${OPENEXR_INC}
+)
+
+set(INC_SYS
+
 )
 
 set(SRC
@@ -41,7 +44,8 @@ set(SRC
 )
 
 if(WITH_IMAGE_OPENEXR)
+	list(APPEND INC_SYS ${OPENEXR_INC})
 	add_definitions(-DWITH_OPENEXR)
 endif()
 
-blender_add_lib(bf_imbuf_openexr "${SRC}" "${INC}")                 
+blender_add_lib(bf_imbuf_openexr "${SRC}" "${INC}" "${INC_SYS}")                 
diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt
index bb95e2c0fbc..429db63b526 100644
--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -58,6 +58,11 @@ add_custom_command(
 
 # Build bf_dna library
 set(INC
+
+)
+
+set(INC_SYS
+
 )
 
 set(SRC
@@ -66,4 +71,4 @@ set(SRC
 	${SRC_DNA_INC}
 )
 
-blender_add_lib(bf_dna "${SRC}" "${INC}")
+blender_add_lib(bf_dna "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 79edb91b972..4e4ff396e71 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -131,8 +131,14 @@ set(SRC
 )
 
 set(INC
+
+)
+
+set(INC_SYS
+
 )
 
+
 if(WITH_PYTHON)
 	add_definitions(-DWITH_PYTHON)
 endif()
@@ -171,7 +177,7 @@ if(WITH_CODEC_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-	list(APPEND INC ${FFMPEG_INC})
+	list(APPEND INC_SYS ${FFMPEG_INC})
 	add_definitions(-DWITH_FFMPEG)
 endif()
 
@@ -217,6 +223,9 @@ blender_include_dirs(
 	../../../../intern/audaspace/intern
 	../../../../intern/guardedalloc
 	../../../../intern/memutil
+)
+
+blender_include_dirs_sys(
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -242,4 +251,4 @@ set(SRC
 	rna_nodetree_types.h
 )
 
-blender_add_lib(bf_rna "${SRC}" "${INC}")
+blender_add_lib(bf_rna "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 7abcb331f08..cf66a27bda2 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -34,6 +34,9 @@ set(INC
 	../render/extern/include
 	../../../intern/guardedalloc
 	../../../intern/elbeem/extern
+)
+
+set(INC_SYS
 	${ZLIB_INCLUDE_DIRS}
 )
 
@@ -85,9 +88,7 @@ set(SRC
 
 if(WITH_MOD_BOOLEAN)
 	add_definitions(-DWITH_MOD_BOOLEAN)
-	list(APPEND SRC
-		intern/MOD_boolean_util.c
-	)
+	list(APPEND SRC intern/MOD_boolean_util.c)
 	list(APPEND INC ../../../intern/bsp/extern)
 endif()
 
@@ -100,4 +101,4 @@ if(NOT WITH_MOD_FLUID)
 	add_definitions(-DDISABLE_ELBEEM)
 endif()
 
-blender_add_lib(bf_modifiers "${SRC}" "${INC}")
+blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index efd5523f5b2..d2b58d61112 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -34,6 +34,9 @@ set(INC
 	../makesrna
 	../render/extern/include
 	../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -149,9 +152,9 @@ set(SRC
 )
 
 if(WITH_PYTHON)
-	set(INC ${INC} ../python ${PYTHON_INCLUDE_DIRS})
+	list(APPEND INC ../python)
+	list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
 	add_definitions(-DWITH_PYTHON)
 endif()
 
-blender_add_lib(bf_nodes "${SRC}" "${INC}")
-
+blender_add_lib(bf_nodes "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt
index 5e4eae4f809..0889c77f9ad 100644
--- a/source/blender/python/generic/CMakeLists.txt
+++ b/source/blender/python/generic/CMakeLists.txt
@@ -25,6 +25,9 @@ set(INC
 	../../blenkernel
 	../../blenloader
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 	${PYTHON_INCLUDE_DIRS}
 )
@@ -60,4 +63,4 @@ set(SRC
 )
 
 
-blender_add_lib(bf_python_ext "${SRC}" "${INC}")
+blender_add_lib(bf_python_ext "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index ab08dc14f07..454a706a16b 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -34,6 +34,9 @@ set(INC
 	../../editors/include
 	../../../../intern/guardedalloc
 	../../../../intern/audaspace/intern
+)
+
+set(INC_SYS
 	${PYTHON_INCLUDE_DIRS}
 )
 
@@ -81,4 +84,4 @@ if(WITH_PYTHON_SAFETY)
 	add_definitions(-DWITH_PYTHON_SAFETY)
 endif()
 
-blender_add_lib(bf_python "${SRC}" "${INC}")
+blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/quicktime/CMakeLists.txt b/source/blender/quicktime/CMakeLists.txt
index 7e7f61036c6..3b70cf19a7f 100644
--- a/source/blender/quicktime/CMakeLists.txt
+++ b/source/blender/quicktime/CMakeLists.txt
@@ -24,24 +24,6 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-if(USE_QTKIT)
-	set(SRC
-		apple/qtkit_import.m
-		apple/qtkit_export.m
-
-		quicktime_export.h
-		quicktime_import.h
-	)
-else()
-	set(SRC
-		apple/quicktime_import.c
-		apple/quicktime_export.c
-
-		quicktime_export.h
-		quicktime_import.h
-	)
-endif()
-
 set(INC 
 	.
 	../quicktime
@@ -58,9 +40,30 @@ set(INC
 	../windowmanager
 	../../../intern/audaspace/intern
 	../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${QUICKTIME_INC}
 )
 
+if(USE_QTKIT)
+	set(SRC
+		apple/qtkit_import.m
+		apple/qtkit_export.m
+
+		quicktime_export.h
+		quicktime_import.h
+	)
+else()
+	set(SRC
+		apple/quicktime_import.c
+		apple/quicktime_export.c
+
+		quicktime_export.h
+		quicktime_import.h
+	)
+endif()
+
 add_definitions(-DWITH_QUICKTIME)
 
-blender_add_lib(bf_quicktime "${SRC}" "${INC}")
+blender_add_lib(bf_quicktime "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index bcb427abd6c..aea377a35bb 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -41,6 +41,10 @@ set(INC
 	../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	intern/raytrace/rayobject.cpp
 	intern/raytrace/rayobject_empty.cpp
@@ -119,7 +123,8 @@ if(WITH_IMAGE_OPENEXR)
 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()
 
@@ -130,4 +135,4 @@ if(APPLE)
 	endif()
 endif()
 
-blender_add_lib_nolist(bf_render "${SRC}" "${INC}")
+blender_add_lib_nolist(bf_render "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 6f03928e1fc..76ba298cd5f 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -43,6 +43,9 @@ set(INC
 	../../../intern/ghost
 	../../../intern/opennl/extern
 	../../../source/gameengine/BlenderRoutines
+)
+
+set(INC_SYS
 	${ZLIB_INCLUDE_DIRS}
 	${OPENGL_INCLUDE_DIR}
 	${GLEW_INCLUDE_PATH}
@@ -50,7 +53,6 @@ set(INC
 
 set(SRC
 	intern/wm.c
-	intern/wm_apple.c
 	intern/wm_cursors.c
 	intern/wm_dragdrop.c
 	intern/wm_draw.c
@@ -87,17 +89,19 @@ if(WITH_OPENCOLLADA)
 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)
@@ -109,12 +113,14 @@ if(WITH_GAMEENGINE)
 	add_definitions(-DWITH_GAMEENGINE)
 endif()
 
-if(WITH_COCOA)
-	list(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/wm_apple.c")
+if(APPLE)
+	if(NOT WITH_COCOA)
+		list(APPEND SRC intern/wm_apple.c)
+	endif()
 endif()
 
 if(WITH_BUILDINFO)
 	add_definitions(-DNAN_BUILDINFO)
 endif()
 
-blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}")
+blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript
index f52ac8ba3cb..fa5e6606347 100644
--- a/source/blender/windowmanager/SConscript
+++ b/source/blender/windowmanager/SConscript
@@ -32,7 +32,7 @@ if env['OURPLATFORM'] == 'linux2':
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
-if env['WITH_GHOST_COCOA']:
+if env['OURPLATFORM'] != 'darwin' or env['WITH_GHOST_COCOA']:
     sources.remove('intern/wm_apple.c')
 
 if env['BF_BUILDINFO']:
diff --git a/source/blender/windowmanager/intern/wm_apple.c b/source/blender/windowmanager/intern/wm_apple.c
index 083500420a4..7748efb6f64 100644
--- a/source/blender/windowmanager/intern/wm_apple.c
+++ b/source/blender/windowmanager/intern/wm_apple.c
@@ -30,8 +30,7 @@
  *  \ingroup wm
  */
 
-
-#ifdef __APPLE__
+/* note, this file builds on apple-carbon only! */
 
 #include "BKE_context.h"
 #include "BKE_global.h"
@@ -137,8 +136,3 @@ void wm_set_apple_prefsize(int scr_x, int scr_y)
 		G.windowstate= 0;
 	}
 }
-
-
-#endif /* __APPLE__ */
-
-
diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
index 73fa01ebff2..2cc6dbc8255 100644
--- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
+++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
@@ -37,15 +37,17 @@ set(INC
 	../../../source/blender/blenkernel
 )
 
+set(INC_SYS
+	
+)
+
 set(SRC
 	stubs.c
 )
 
 if(WITH_BUILDINFO)
+	list(APPEND SRC ../../creator/buildinfo.c)
 	add_definitions(-DBUILD_DATE)
-	list(APPEND SRC
-		../../creator/buildinfo.c
-	)
 endif()
 
 if(WITH_GAMEENGINE)
@@ -56,4 +58,4 @@ if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_FREETYPE2)
 endif()
 
-blender_add_lib_nolist(blenkernel_blc "${SRC}" "${INC}")
+blender_add_lib_nolist(blenkernel_blc "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt
index 6a17017f261..a67e2eb7038 100644
--- a/source/gameengine/BlenderRoutines/CMakeLists.txt
+++ b/source/gameengine/BlenderRoutines/CMakeLists.txt
@@ -32,6 +32,10 @@ set(INC
 	${GLEW_INCLUDE_PATH}
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	BL_KetsjiEmbedStart.cpp
 	BL_System.cpp
@@ -59,4 +63,4 @@ if(WITH_CODEC_FFMPEG)
 	add_definitions(-DWITH_FFMPEG)
 endif()
 
-blender_add_lib(ge_blen_routines "${SRC}" "${INC}")
+blender_add_lib(ge_blen_routines "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt
index bdd0769e0a3..6cfd8c9b42b 100644
--- a/source/gameengine/Converter/CMakeLists.txt
+++ b/source/gameengine/Converter/CMakeLists.txt
@@ -59,6 +59,10 @@ set(INC
 	../../../extern/bullet2/src
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	BL_ActionActuator.cpp
 	BL_ArmatureActuator.cpp
@@ -109,4 +113,4 @@ if(WITH_BULLET)
 	add_definitions(-DUSE_BULLET)
 endif()
 
-blender_add_lib(ge_converter "${SRC}" "${INC}")
+blender_add_lib(ge_converter "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/Expressions/CMakeLists.txt b/source/gameengine/Expressions/CMakeLists.txt
index 8cda0e2dc77..83d44e1b318 100644
--- a/source/gameengine/Expressions/CMakeLists.txt
+++ b/source/gameengine/Expressions/CMakeLists.txt
@@ -33,6 +33,10 @@ set(INC
 	../../../source/blender/blenloader
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	BoolValue.cpp
 	ConstExpr.cpp
@@ -77,4 +81,4 @@ set(SRC
 	VoidValue.h
 )
 
-blender_add_lib(ge_logic_expressions "${SRC}" "${INC}")
+blender_add_lib(ge_logic_expressions "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/GameLogic/CMakeLists.txt b/source/gameengine/GameLogic/CMakeLists.txt
index 2acf07584b1..b6721650bad 100644
--- a/source/gameengine/GameLogic/CMakeLists.txt
+++ b/source/gameengine/GameLogic/CMakeLists.txt
@@ -34,6 +34,10 @@ set(INC
 	../../../source/gameengine/Rasterizer
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	Joystick/SCA_Joystick.cpp
 	Joystick/SCA_JoystickEvents.cpp
@@ -124,9 +128,9 @@ set(SRC
 )
 
 if(WITH_SDL)
-	set(INC ${INC} ${SDL_INCLUDE_DIR})
+	list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
 else()
 	add_definitions(-DDISABLE_SDL)
 endif()
 
-blender_add_lib(ge_logic "${SRC}" "${INC}")
+blender_add_lib(ge_logic "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt
index afbc49ea38d..d16ec6a2f22 100644
--- a/source/gameengine/GamePlayer/common/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/common/CMakeLists.txt
@@ -51,6 +51,9 @@ set(INC
 	../../../../source/gameengine/GamePlayer/ghost
 	../../../../source/blender/blenloader
 	../../../../source/blender/gpu
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 	${PYTHON_INCLUDE_DIRS}
 	${PNG_INCLUDE_DIR}
@@ -82,4 +85,4 @@ set(SRC
 
 add_definitions(-DGLEW_STATIC)
 
-blender_add_lib_nolist(ge_player_common "${SRC}" "${INC}")
+blender_add_lib_nolist(ge_player_common "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
index 389300efc21..5ac121099c3 100644
--- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
@@ -52,6 +52,9 @@ set(INC
 	../../../../source/gameengine/GamePlayer/common
 	../../../../source/blender/blenloader
 	../../../../source/blender/gpu
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 	${PYTHON_INCLUDE_DIRS}
 )
@@ -75,4 +78,4 @@ if(WITH_CODEC_FFMPEG)
 	add_definitions(-DWITH_FFMPEG)
 endif()
 
-blender_add_lib_nolist(ge_player_ghost "${SRC}" "${INC}")
+blender_add_lib_nolist(ge_player_ghost "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt
index 0bfe1fd0266..a6339439bea 100644
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -53,6 +53,9 @@ set(INC
 	../../../intern/audaspace/intern
 	../../../source/blender/blenloader
 	../../../source/blender/gpu
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -207,7 +210,7 @@ set(SRC
 add_definitions(-DGLEW_STATIC)
 
 if(WITH_SDL)
-	set(INC ${INC} ${SDL_INCLUDE_DIR})  
+	list(APPEND INC_SYS ${SDL_INCLUDE_DIR})  
 else()
 	add_definitions(-DDISABLE_SDL)
 endif()
@@ -217,9 +220,11 @@ if(WITH_CODEC_FFMPEG)
 endif()
 
 if(WITH_BULLET)
+	list(APPEND INC
+		../../../extern/bullet2/src
+		../../../source/gameengine/Physics/Bullet
+	)
 	add_definitions(-DUSE_BULLET)
-	list(APPEND INC ../../../extern/bullet2/src)
-	list(APPEND INC ../../../source/gameengine/Physics/Bullet )
 endif()
 
-blender_add_lib(ge_logic_ketsji "${SRC}" "${INC}")
+blender_add_lib(ge_logic_ketsji "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
index 17a5929420d..b8149566801 100644
--- a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
+++ b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
@@ -36,6 +36,10 @@ set(INC
 	../../../../source/gameengine/Network
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	KX_NetworkEventManager.cpp
 	KX_NetworkMessageActuator.cpp
@@ -50,4 +54,4 @@ set(SRC
 	KX_NetworkObjectSensor.h
 )
 
-blender_add_lib(ge_logic_network "${SRC}" "${INC}")
+blender_add_lib(ge_logic_network "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/Network/CMakeLists.txt b/source/gameengine/Network/CMakeLists.txt
index 7f4c7c357da..e1f3bfaac77 100644
--- a/source/gameengine/Network/CMakeLists.txt
+++ b/source/gameengine/Network/CMakeLists.txt
@@ -31,6 +31,10 @@ set(INC
 	../../../intern/moto/include
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	NG_NetworkMessage.cpp
 	NG_NetworkObject.cpp
@@ -42,4 +46,4 @@ set(SRC
 	NG_NetworkScene.h
 )
 
-blender_add_lib(ge_logic_ngnetwork "${SRC}" "${INC}")
+blender_add_lib(ge_logic_ngnetwork "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
index d7b88304474..9c3936987f2 100644
--- a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
+++ b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
@@ -31,10 +31,14 @@ set(INC
 	../../../../source/gameengine/Network
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	NG_LoopBackNetworkDeviceInterface.cpp
 
 	NG_LoopBackNetworkDeviceInterface.h
 )
 
-blender_add_lib(ge_logic_loopbacknetwork "${SRC}" "${INC}")
+blender_add_lib(ge_logic_loopbacknetwork "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/Physics/Bullet/CMakeLists.txt b/source/gameengine/Physics/Bullet/CMakeLists.txt
index a984d0436f0..aadd11cc036 100644
--- a/source/gameengine/Physics/Bullet/CMakeLists.txt
+++ b/source/gameengine/Physics/Bullet/CMakeLists.txt
@@ -43,6 +43,9 @@ set(INC
 	../../../../source/blender/makesdna
 	../../../../source/blender/blenlib
 	../../../../source/blender/blenkernel
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 	${PYTHON_INCLUDE_DIRS}
 )
@@ -61,4 +64,4 @@ if(WITH_BULLET)
 	add_definitions(-DUSE_BULLET)
 endif()
 
-blender_add_lib(ge_phys_bullet "${SRC}" "${INC}")
+blender_add_lib(ge_phys_bullet "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/Physics/Dummy/CMakeLists.txt b/source/gameengine/Physics/Dummy/CMakeLists.txt
index fd7f37897eb..11230bbe571 100644
--- a/source/gameengine/Physics/Dummy/CMakeLists.txt
+++ b/source/gameengine/Physics/Dummy/CMakeLists.txt
@@ -29,10 +29,14 @@ set(INC
 	../common
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	DummyPhysicsEnvironment.cpp
 
 	DummyPhysicsEnvironment.h
 )
 
-blender_add_lib(ge_phys_dummy "${SRC}" "${INC}")
+blender_add_lib(ge_phys_dummy "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/Physics/common/CMakeLists.txt b/source/gameengine/Physics/common/CMakeLists.txt
index 50aa9083089..9da7aaa6ba7 100644
--- a/source/gameengine/Physics/common/CMakeLists.txt
+++ b/source/gameengine/Physics/common/CMakeLists.txt
@@ -29,6 +29,10 @@ set(INC
 	../Dummy
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	PHY_IMotionState.cpp
 	PHY_IController.cpp
@@ -47,4 +51,4 @@ set(SRC
 	PHY_Pro.h
 )
 
-blender_add_lib(ge_phys_common "${SRC}" "${INC}")
+blender_add_lib(ge_phys_common "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/Rasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/CMakeLists.txt
index 2bfb3f8f328..b705d3151b2 100644
--- a/source/gameengine/Rasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/CMakeLists.txt
@@ -34,6 +34,9 @@ set(INC
 	../../../intern/moto/include
 	../../../intern/guardedalloc
 	../Expressions
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 	${PYTHON_INCLUDE_DIRS}
 )
@@ -81,4 +84,4 @@ set(SRC
 
 add_definitions(-DGLEW_STATIC)
 
-blender_add_lib(ge_rasterizer "${SRC}" "${INC}")
+blender_add_lib(ge_rasterizer "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
index 99068aa1bb8..a005bb1108d 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
@@ -37,6 +37,9 @@ set(INC
 	../../../../source/blender/blenkernel
 	../../../../source/blender/blenlib
 	../../../../source/blender/blenloader
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -54,4 +57,4 @@ set(SRC
 
 add_definitions(-DGLEW_STATIC)
 
-blender_add_lib(ge_oglrasterizer "${SRC}" "${INC}")
+blender_add_lib(ge_oglrasterizer "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/SceneGraph/CMakeLists.txt b/source/gameengine/SceneGraph/CMakeLists.txt
index a054252ea0b..2f6b90a21a7 100644
--- a/source/gameengine/SceneGraph/CMakeLists.txt
+++ b/source/gameengine/SceneGraph/CMakeLists.txt
@@ -29,6 +29,10 @@ set(INC
 	../../../intern/moto/include
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	SG_BBox.cpp
 	SG_Controller.cpp
@@ -48,4 +52,4 @@ set(SRC
 	SG_Tree.h
 )
 
-blender_add_lib(ge_scenegraph "${SRC}" "${INC}")
+blender_add_lib(ge_scenegraph "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/VideoTexture/CMakeLists.txt b/source/gameengine/VideoTexture/CMakeLists.txt
index b544139d4a7..201714be74a 100644
--- a/source/gameengine/VideoTexture/CMakeLists.txt
+++ b/source/gameengine/VideoTexture/CMakeLists.txt
@@ -46,6 +46,9 @@ set(INC
 	../../../intern/moto/include
 	../../../intern/guardedalloc
 	../../../intern/ffmpeg
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )
 
@@ -87,9 +90,12 @@ set(SRC
 )
 
 if(WITH_CODEC_FFMPEG)
-	set(INC ${INC} ${FFMPEG_INC} ${PTHREADS_INC})
+	list(APPEND INC_SYS
+		${FFMPEG_INC}
+		${PTHREADS_INC}
+	)
 	add_definitions(-DWITH_FFMPEG)
 	add_definitions(-D__STDC_CONSTANT_MACROS)
 endif()
 
-blender_add_lib(ge_videotex "${SRC}" "${INC}")
+blender_add_lib(ge_videotex "${SRC}" "${INC}" "${INC_SYS}")
author	Campbell Barton <ideasman42@gmail.com>	2011-05-31 05:15:44 +0400
committer	Campbell Barton <ideasman42@gmail.com>	2011-05-31 05:15:44 +0400
commit	09da9d43931a09e3786343e724a3de7217285d0d (patch)
tree	4c48fbd4404687fd04254d071d535499a1ae4058
parent	dcd55cef86270f076cf827c5ae7a6cc76db4f9ad (diff)