- added back zlib include (needed for win32).

- use list append in more places.
- remove non existing include dir.

34 files changed, 105 insertions, 92 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ca96fc8dc8..4fdc6b9ebf6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -309,8 +309,8 @@ IF(UNIX AND NOT APPLE)
 
 	IF(WITH_OPENMP)
 		LIST(APPEND LLIBS -lgomp)
-		LIST(APPEND CMAKE_C_FLAGS -fopenmp)
-		LIST(APPEND CMAKE_CXX_FLAGS -fopenmp)
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
 	ENDIF(WITH_OPENMP)
 
 
@@ -401,8 +401,7 @@ IF(WIN32)
 	ENDIF(WITH_QUICKTIME)
 
 	IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
-		ADD_DEFINITIONS(-D__SSE__)
-		ADD_DEFINITIONS(-D__MMX__)
+		ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
 	ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
 
 	IF(MSVC)
@@ -865,8 +864,7 @@ IF(WITH_RAYOPTIMIZATION)
 	IF(CMAKE_COMPILER_IS_GNUCC)
 		IF(SUPPORT_SSE_BUILD)
 			SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}")
-			ADD_DEFINITIONS(-D__SSE__)
-			ADD_DEFINITIONS(-D__MMX__)
+			ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
 		ENDIF(SUPPORT_SSE_BUILD)
 		IF(SUPPORT_SSE2_BUILD)
 			SET(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}")
diff --git a/extern/glew/CMakeLists.txt b/extern/glew/CMakeLists.txt
index 1c4faf04441..b22c7caaaae 100644
--- a/extern/glew/CMakeLists.txt
+++ b/extern/glew/CMakeLists.txt
@@ -27,7 +27,7 @@
 SET(INC include src)
 
 IF(UNIX)
-	SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
+	LIST(APPEND INC ${X11_X11_INCLUDE_PATH})
 ENDIF(UNIX)
 
 SET(SRC
@@ -37,4 +37,3 @@ SET(SRC
 ADD_DEFINITIONS(-DGLEW_STATIC)
 
 BLENDERLIB(extern_glew "${SRC}" "${INC}")
-
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt
index 5d73f953e67..6982bd83276 100644
--- a/intern/audaspace/CMakeLists.txt
+++ b/intern/audaspace/CMakeLists.txt
@@ -36,49 +36,43 @@ FILE(GLOB SRC
 )
 
 IF(WITH_FFMPEG)
-	LIST(APPEND INC ffmpeg)
-	LIST(APPEND INC ${FFMPEG_INC})
+	LIST(APPEND INC ffmpeg ${FFMPEG_INC})
 	FILE(GLOB FFMPEGSRC ffmpeg/*.cpp)
 	ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_SDL)
-	LIST(APPEND INC SDL)
-	LIST(APPEND INC ${SDL_INCLUDE_DIR})
+	LIST(APPEND INC SDL ${SDL_INCLUDE_DIR})
 	FILE(GLOB SDLSRC SDL/*.cpp)
 	ADD_DEFINITIONS(-DWITH_SDL)
 ENDIF(WITH_SDL)
 
 IF(WITH_OPENAL)
-	LIST(APPEND INC OpenAL)
-	LIST(APPEND INC ${OPENAL_INCLUDE_DIR})
+	LIST(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR})
 	FILE(GLOB OPENALSRC OpenAL/*.cpp)
 	ADD_DEFINITIONS(-DWITH_OPENAL)
 ENDIF(WITH_OPENAL)
 
 IF(WITH_JACK)
-	LIST(APPEND INC jack)
-	LIST(APPEND INC ${JACK_INC})
+	LIST(APPEND INC jack ${JACK_INC})
 	FILE(GLOB JACKSRC jack/*.cpp)
 	ADD_DEFINITIONS(-DWITH_JACK)
 ENDIF(WITH_JACK)
 
 IF(WITH_SNDFILE)
-	LIST(APPEND INC sndfile)
-	LIST(APPEND INC ${SNDFILE_INC})
+	LIST(APPEND INC sndfile ${SNDFILE_INC})
 	FILE(GLOB SNDFILESRC sndfile/*.cpp)
 	ADD_DEFINITIONS(-DWITH_SNDFILE)
 ENDIF(WITH_SNDFILE)
 
 #IF(WITH_FFTW3)
-#	SET(INC ${INC} fftw ${FFTW3_INC})
+#	LIST(APPEND INC fftw ${FFTW3_INC})
 #	FILE(GLOB FFTW3SRC fftw/*.cpp)
 #	ADD_DEFINITIONS(-DWITH_FFTW3)
 #ENDIF(WITH_FFTW3)
 
 IF(WITH_PYTHON)
-	LIST(APPEND INC Python)
-	LIST(APPEND INC ${PYTHON_INC})
+	LIST(APPEND INC Python ${PYTHON_INC})
 	FILE(GLOB PYTHONSRC Python/*.cpp)
 ELSE(WITH_PYTHON)
 	ADD_DEFINITIONS(-DDISABLE_PYTHON)
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index c6ffd4b1913..ec81ddf8ef2 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -52,13 +52,13 @@ SET(SRC
 
 IF(APPLE)
 	IF(WITH_COCOA)
-		SET(SRC ${SRC}
+		LIST(APPEND SRC
 			${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCocoa.mm
 			${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCocoa.mm
 			${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCocoa.mm
 		)
 	ELSE(WITH_COCOA)
-		SET(SRC ${SRC}
+		LIST(APPEND SRC
 			${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp
@@ -69,18 +69,18 @@ IF(APPLE)
 		ADD_DEFINITIONS(-DWITH_QUICKTIME)
 	ENDIF(WITH_QUICKTIME)
 ELSEIF(WIN32)
-	SET(INC ${INC} ${WINTAB_INC})
+	LIST(APPEND INC ${WINTAB_INC})
 
-	SET(SRC ${SRC}
+	LIST(APPEND SRC
 		${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DropTargetWin32.cpp
 	)
 ELSEIF(UNIX)
-	SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
+	LIST(APPEND INC ${X11_X11_INCLUDE_PATH})
 
-	SET(SRC ${SRC}
+	LIST(APPEND SRC
 		${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerX11.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp
diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt
index f099efd2bb8..6c844cbd232 100644
--- a/intern/smoke/CMakeLists.txt
+++ b/intern/smoke/CMakeLists.txt
@@ -24,7 +24,14 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC ${PNG_INC} ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc)
+SET(INC
+	intern
+	../memutil
+	../guardealloc
+	../../extern/bullet2/src
+	${PNG_INC}
+	${ZLIB_INC}
+)
 
 FILE(GLOB SRC intern/*.cpp)
 
@@ -34,9 +41,8 @@ ENDIF(WITH_OPENMP)
 
 IF(WITH_FFTW3)
 	ADD_DEFINITIONS(-DFFTW3=1)
-	SET(INC ${INC} ${FFTW3_INC})
+	LIST(APPEND INC ${FFTW3_INC})
 ENDIF(WITH_FFTW3)
 
-
 BLENDERLIB(bf_intern_smoke "${SRC}" "${INC}")
-#, libtype='blender', priority = 0 )
+
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 0603081b59c..155d14fb5a1 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -87,8 +87,7 @@ IF(WITH_IMAGE_HDR)
 ENDIF(WITH_IMAGE_HDR)
 
 IF(WITH_QUICKTIME)
-	LIST(APPEND INC ../quicktime)
-	LIST(APPEND INC ${QUICKTIME_INC})
+	LIST(APPEND INC ../quicktime ${QUICKTIME_INC})
 	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
@@ -103,8 +102,7 @@ IF(WITH_LCMS)
 ENDIF(WITH_LCMS)
 
 IF(WITH_PYTHON)
-	LIST(APPEND INC ../python)
-	LIST(APPEND INC ${PYTHON_INC})
+	LIST(APPEND INC ../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
 	ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 998b3c670d0..77615b23d87 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -34,6 +34,7 @@ SET(INC
 	../gpu
 	../../../intern/ghost
 	../../../intern/guardedalloc
+	${ZLIB_INC}
 	${FREETYPE_INCLUDE_DIRS}
 )
 
@@ -45,7 +46,7 @@ SET(INC
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 IF(WITH_OPENMP)
diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/blenpluginapi/CMakeLists.txt
index 2699b3b7c3b..42aa5eddc42 100644
--- a/source/blender/blenpluginapi/CMakeLists.txt
+++ b/source/blender/blenpluginapi/CMakeLists.txt
@@ -31,11 +31,11 @@ SET(INC
 )
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 IF(WITH_QUICKTIME)
-	SET(INC ${INC} ${QUICKTIME_INC})
+	LIST(APPEND INC ${QUICKTIME_INC})
 	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt
index 9e22bbd7d44..b5634921343 100644
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -33,7 +33,7 @@ SET(INC
 )
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_armature "${SRC}" "${INC}")
diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt
index 5f75ceb34ef..4145f251a64 100644
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -34,7 +34,7 @@ SET(INC
 )
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_mesh "${SRC}" "${INC}")
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index a41b9e89f83..10fbd62a098 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -41,7 +41,7 @@ IF(NOT WITH_PYTHON)
 ENDIF(NOT WITH_PYTHON)
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_object "${SRC}" "${INC}")
diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt
index be826654311..49f20bb9ed0 100644
--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@@ -41,7 +41,7 @@ IF(WITH_OPENMP)
 ENDIF(WITH_OPENMP)
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_physics "${SRC}" "${INC}")
diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt
index 2ecdc14a497..322e69ca843 100644
--- a/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@ -48,7 +48,7 @@ IF(WITH_OPENMP)
 ENDIF(WITH_OPENMP)
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_render "${SRC}" "${INC}")
diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt
index 6bbd1112d05..b6a8e27449b 100644
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -34,7 +34,7 @@ SET(INC
 )
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_screen "${SRC}" "${INC}")
diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt
index f0493d8e2d8..fb8382e10ca 100644
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -35,7 +35,7 @@ SET(INC
 )
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_sculpt_paint "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt
index 5cbe9bbe0ba..207d83b56c6 100644
--- a/source/blender/editors/space_file/CMakeLists.txt
+++ b/source/blender/editors/space_file/CMakeLists.txt
@@ -61,7 +61,7 @@ IF(WITH_IMAGE_HDR)
 ENDIF(WITH_IMAGE_HDR)
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_space_file "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt
index f644338d39d..1c0a97767b7 100644
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -47,7 +47,7 @@ IF(WITH_LCMS)
 ENDIF(WITH_LCMS)
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_space_image "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt
index 0c8f9fc1ee2..06dd2257147 100644
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -36,7 +36,7 @@ SET(INC
 )
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_space_node "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index a6945bbe9bb..ca9ad001a40 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -42,7 +42,7 @@ IF(WITH_GAMEENGINE)
 ENDIF(WITH_GAMEENGINE)
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 ADD_DEFINITIONS(-DGLEW_STATIC)
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index 49886bdc46f..c0023d49c95 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -41,7 +41,7 @@ SET(INC
 )
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 IF(WITH_IMAGE_OPENEXR)
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 9dbb2fd00aa..4f9032ffc95 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -63,7 +63,7 @@ IF(NOT WITH_PYTHON)
 ENDIF(NOT WITH_PYTHON)
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 IF(WITH_GAMEENGINE)
@@ -95,17 +95,17 @@ IF(WITH_IMAGE_HDR)
 ENDIF(WITH_IMAGE_HDR)
 
 IF(WITH_QUICKTIME)
-	SET(INC ${INC} ../../quicktime)
+	LIST(APPEND INC ../../quicktime)
 	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-	SET(INC ${INC} ${FFMPEG_INC})
+	LIST(APPEND INC ${FFMPEG_INC})
 	ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_LCMS)
-	SET(INC ${INC} ${LCMS_INCLUDE_DIR})
+	LIST(APPEND INC ${LCMS_INCLUDE_DIR})
 	ADD_DEFINITIONS(-DWITH_LCMS)
 ENDIF(WITH_LCMS)
 
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index d5e8e37f1fd..8d8423cc19b 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -40,7 +40,7 @@ SET(INC
 )
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 IF(WITH_PYTHON)
diff --git a/source/blender/python/CMakeLists.txt b/source/blender/python/CMakeLists.txt
index dcfc8678faa..adb60528f51 100644
--- a/source/blender/python/CMakeLists.txt
+++ b/source/blender/python/CMakeLists.txt
@@ -46,4 +46,3 @@ IF(WITH_BUILDINFO)
 ENDIF(WITH_BUILDINFO)
 
 BLENDERLIB(bf_python "${SRC}" "${INC}")
-
diff --git a/source/blender/quicktime/CMakeLists.txt b/source/blender/quicktime/CMakeLists.txt
index 63b6558e997..8d993cbb7d6 100644
--- a/source/blender/quicktime/CMakeLists.txt
+++ b/source/blender/quicktime/CMakeLists.txt
@@ -35,7 +35,6 @@ SET(INC
 	../quicktime
 	../makesdna
 	../makesrna
-	../../../intern/guardedalloc
 	../blenlib
 	../blenkernel
 	../avi
@@ -46,9 +45,10 @@ SET(INC
 	../include
 	../windowmanager
 	../../../intern/audaspace/intern
+	../../../intern/guardedalloc
+	${QUICKTIME_INC}
 )
 
-SET(INC ${INC} ${QUICKTIME_INC})
 ADD_DEFINITIONS(-DWITH_QUICKTIME)
 
 BLENDERLIB(bf_quicktime "${SRC}" "${INC}")
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 1b6a29b616a..68968304915 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -27,15 +27,22 @@
 FILE(GLOB SRC intern/source/*.c intern/raytrace/*.cpp)
 
 SET(INC 
-	intern/include ../../../intern/guardedalloc ../blenlib ../makesdna
-	extern/include ../blenkernel ../imbuf
-	../include ../../kernel/gen_messaging ../blenloader
-	../../../intern/smoke/extern
+	intern/include
+	extern/include
+	../blenlib
+	../blenloader
+	../makesdna
 	../makesrna
+	../blenkernel
+	../imbuf
+	../include
+	../../kernel/gen_messaging
+	../../../intern/smoke/extern
+	../../../intern/guardedalloc
 )
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 IF(WITH_IMAGE_OPENEXR)
@@ -43,14 +50,14 @@ IF(WITH_IMAGE_OPENEXR)
 ENDIF(WITH_IMAGE_OPENEXR)
 
 IF(WITH_QUICKTIME)
-	SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
+	LIST(APPEND INC ../quicktime ${QUICKTIME_INC})
 	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(APPLE)
 	IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
-		SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse")
-		SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse")
+		LIST(APPEND CMAKE_C_FLAGS_RELEASE -mfpmath=sse)
+		LIST(APPEND CMAKE_CXX_FLAGS_RELEASE -mfpmath=sse)
 	ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
 ENDIF(APPLE)
 
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index a96cce5fc68..1919bf8e571 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -26,18 +26,27 @@
 
 FILE(GLOB SRC intern/*.c)
 
-SET(INC .
-	../editors/include
-	../../../intern/guardedalloc ../../../intern/memutil
-	../blenlib ../makesdna ../makesrna ../blenkernel
-	../include ../imbuf ../render/extern/include
-	../blenloader
-	../../kernel/gen_system ../readstreamglue
-	../../../intern/elbeem/extern
-	../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include
+SET(INC
+	.
 	../nodes
 	../gpu
 	../blenfont
+	../blenlib
+	../makesdna
+	../makesrna
+	../blenkernel
+	../include
+	../imbuf
+	../blenloader
+	../editors/include
+	../render/extern/include
+	../../kernel/gen_system
+	../../../intern/guardedalloc
+	../../../intern/memutil
+	../../../intern/elbeem/extern
+	../../../intern/ghost
+	../../../intern/opennl/extern
+	../../../extern/glew/include
 	${OPENGL_INCLUDE_DIR}
 )
 
@@ -52,23 +61,23 @@ IF(WITH_OPENCOLLADA)
 ENDIF(WITH_OPENCOLLADA)
 
 IF(WITH_QUICKTIME)
-	SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
+	LIST(APPEND INC ../quicktime ${QUICKTIME_INC})
 	ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-	SET(INC ${INC} ${FFMPEG_INC})
+	LIST(APPEND INC ${FFMPEG_INC})
 	ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-	SET(INC ${INC} ../python ${PYTHON_INC})
+	LIST(APPEND INC ../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
 	ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(WIN32)
-	SET(INC ${INC} ${PTHREADS_INC})
+	LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 IF(WITH_COCOA)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index c4e01ba1a9d..1e6ae8a8492 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -95,12 +95,14 @@ IF(WIN32)
 ENDIF(WIN32)
 
 IF(WITH_BUILDINFO)
-	ADD_DEFINITIONS(-DBUILD_DATE="${BUILD_DATE}")
-	ADD_DEFINITIONS(-DBUILD_TIME="${BUILD_TIME}")
-	ADD_DEFINITIONS(-DBUILD_REV="${BUILD_REV}")
-	ADD_DEFINITIONS(-DBUILD_PLATFORM="${CMAKE_SYSTEM_NAME}")
-	ADD_DEFINITIONS(-DBUILD_TYPE="${CMAKE_BUILD_TYPE}")
-	
+	ADD_DEFINITIONS(
+		-DBUILD_DATE="${BUILD_DATE}"
+		-DBUILD_TIME="${BUILD_TIME}"
+		-DBUILD_REV="${BUILD_REV}"
+		-DBUILD_PLATFORM="${CMAKE_SYSTEM_NAME}"
+		-DBUILD_TYPE="${CMAKE_BUILD_TYPE}"
+	)
+
 	LIST(APPEND EXESRC buildinfo.c)
 ENDIF(WITH_BUILDINFO)
 
diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt
index 57d28561647..853cba543a4 100644
--- a/source/gameengine/BlenderRoutines/CMakeLists.txt
+++ b/source/gameengine/BlenderRoutines/CMakeLists.txt
@@ -44,7 +44,7 @@ IF(WITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-	SET(INC ${INC} ${PYTHON_INC})
+	LIST(APPEND INC ${PYTHON_INC})
 ELSE(WITH_PYTHON)
 	ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt
index 97c367dd1f1..c5b8128903b 100644
--- a/source/gameengine/Converter/CMakeLists.txt
+++ b/source/gameengine/Converter/CMakeLists.txt
@@ -64,7 +64,7 @@ SET(INC
 )
 
 IF(WITH_PYTHON)
-	SET(INC ${INC} ${PYTHON_INC})
+	LIST(APPEND INC ${PYTHON_INC})
 ELSE(WITH_PYTHON)
 	ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
diff --git a/source/gameengine/Expressions/CMakeLists.txt b/source/gameengine/Expressions/CMakeLists.txt
index 85b5daa3b4a..126192d2188 100644
--- a/source/gameengine/Expressions/CMakeLists.txt
+++ b/source/gameengine/Expressions/CMakeLists.txt
@@ -37,7 +37,7 @@ SET(INC
 )
 
 IF(WITH_PYTHON)
-	SET(INC ${INC} ${PYTHON_INC})
+	LIST(APPEND INC ${PYTHON_INC})
 ELSE(WITH_PYTHON)
 	ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
diff --git a/source/gameengine/GameLogic/CMakeLists.txt b/source/gameengine/GameLogic/CMakeLists.txt
index 93183dafeee..84d915847e9 100644
--- a/source/gameengine/GameLogic/CMakeLists.txt
+++ b/source/gameengine/GameLogic/CMakeLists.txt
@@ -43,7 +43,7 @@ ELSE(WITH_SDL)
 ENDIF(WITH_SDL)
 
 IF(WITH_PYTHON)
-	SET(INC ${INC} ${PYTHON_INC})
+	LIST(APPEND INC ${PYTHON_INC})
 ELSE(WITH_PYTHON)
 	ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt
index d8f6e3164ec..eaead261b2c 100644
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -70,7 +70,7 @@ ELSE(WITH_SDL)
 ENDIF(WITH_SDL)
 
 IF(WITH_PYTHON)
-	SET(INC ${INC} ${PYTHON_INC})
+	LIST(APPEND INC ${PYTHON_INC})
 ELSE(WITH_PYTHON)
 	ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
diff --git a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
index ce3d8fa22fc..106d1a84a92 100644
--- a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
+++ b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
@@ -39,7 +39,7 @@ SET(INC
 )
 
 IF(WITH_PYTHON)
-	SET(INC ${INC} ${PYTHON_INC})
+	LIST(APPEND INC ${PYTHON_INC})
 ELSE(WITH_PYTHON)
 	ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
diff --git a/source/gameengine/VideoTexture/CMakeLists.txt b/source/gameengine/VideoTexture/CMakeLists.txt
index 3af514ca0de..34a32328e29 100644
--- a/source/gameengine/VideoTexture/CMakeLists.txt
+++ b/source/gameengine/VideoTexture/CMakeLists.txt
@@ -58,7 +58,7 @@ IF(WITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-	SET(INC ${INC} ${PYTHON_INC})
+	LIST(APPEND INC ${PYTHON_INC})
 ELSE(WITH_PYTHON)
 	ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)