- added back zlib include (needed for win32).

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

3 files changed, 23 insertions, 23 deletions

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 )
+