cmake source definitions:

remove missing includes and use more strict formatting.

extern/glew/CMakeLists.txt

@@ -33,7 +33,9 @@ set(INC_SYS
 )
 
 if(UNIX)
-	list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH})
+	list(APPEND INC_SYS
+		${X11_X11_INCLUDE_PATH}
+	)
 endif()
 
 set(SRC

extern/lzo/CMakeLists.txt

@@ -25,7 +25,7 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-	include
+
 )
 
 set(INC_SYS

intern/audaspace/CMakeLists.txt

@@ -159,8 +159,12 @@ set(SRC
 
 if(WITH_CODEC_FFMPEG)
 	add_definitions(-DWITH_FFMPEG)
-	list(APPEND INC ffmpeg)
+	list(APPEND INC
-	list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
+		ffmpeg
+	)
+	list(APPEND INC_SYS
+		${FFMPEG_INCLUDE_DIRS}
+	)
 	list(APPEND SRC
 		ffmpeg/AUD_FFMPEGFactory.cpp
 		ffmpeg/AUD_FFMPEGReader.cpp
@@ -172,8 +176,12 @@ endif()
 
 if(WITH_SDL)
 	add_definitions(-DWITH_SDL)
-	list(APPEND INC SDL)
+	list(APPEND INC
-	list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
+		SDL
+	)
+	list(APPEND INC_SYS
+		${SDL_INCLUDE_DIR}
+	)
 	list(APPEND SRC
 		SDL/AUD_SDLDevice.cpp
 
@@ -183,8 +191,12 @@ endif()
 
 if(WITH_OPENAL)
 	add_definitions(-DWITH_OPENAL)
-	list(APPEND INC OpenAL)
+	list(APPEND INC
-	list(APPEND INC_SYS ${OPENAL_INCLUDE_DIR})
+		OpenAL
+	)
+	list(APPEND INC_SYS
+		${OPENAL_INCLUDE_DIR}
+	)
 	list(APPEND SRC
 		OpenAL/AUD_OpenALDevice.cpp
 
@@ -194,8 +206,12 @@ endif()
 
 if(WITH_JACK)
 	add_definitions(-DWITH_JACK)
-	list(APPEND INC jack)
+	list(APPEND INC
-	list(APPEND INC_SYS ${JACK_INCLUDE_DIRS})
+		jack
+	)
+	list(APPEND INC_SYS
+		${JACK_INCLUDE_DIRS}
+	)
 	list(APPEND SRC
 		jack/AUD_JackDevice.cpp
 
@@ -205,8 +221,12 @@ endif()
 
 if(WITH_CODEC_SNDFILE)
 	add_definitions(-DWITH_SNDFILE)
-	list(APPEND INC sndfile)
+	list(APPEND INC
-	list(APPEND INC_SYS ${SNDFILE_INCLUDE_DIRS})
+		sndfile
+	)
+	list(APPEND INC_SYS
+		${SNDFILE_INCLUDE_DIRS}
+	)
 	list(APPEND SRC
 		sndfile/AUD_SndFileFactory.cpp
 		sndfile/AUD_SndFileReader.cpp
@@ -218,7 +238,9 @@ endif()
 
 if(WITH_SAMPLERATE)
 	add_definitions(-DWITH_SAMPLERATE)
-	list(APPEND INC_SYS ${SAMPLERATE_INCLUDE_DIRS})
+	list(APPEND INC_SYS
+		${SAMPLERATE_INCLUDE_DIRS}
+	)
 	list(APPEND SRC
 		SRC/AUD_SRCResampleFactory.cpp
 		SRC/AUD_SRCResampleReader.cpp
@@ -230,8 +252,12 @@ endif()
 
 if(WITH_FFTW3 AND FALSE)
 	add_definitions(-DWITH_FFTW3)
-	list(APPEND INC fftw)
+	list(APPEND INC
-	list(APPEND INC_SYS ${FFTW3_INCLUDE_DIRS})
+		fftw
+	)
+	list(APPEND INC_SYS
+		${FFTW3_INCLUDE_DIRS}
+	)
 	list(APPEND SRC
 		fftw/AUD_BandPassFactory.cpp
 		fftw/AUD_BandPassReader.cpp
@@ -242,8 +268,12 @@ if(WITH_FFTW3 AND FALSE)
 endif()
 
 if(WITH_PYTHON)
-	list(APPEND INC Python)
+	list(APPEND INC
-	list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
+		Python
+	)
+	list(APPEND INC_SYS
+		${PYTHON_INCLUDE_DIRS}
+	)
 	list(APPEND SRC
 		Python/AUD_PyAPI.cpp
 

intern/ghost/CMakeLists.txt

@@ -146,7 +146,9 @@ if(WITH_HEADLESS OR WITH_GHOST_SDL)
 		)
 	endif()
 
-	list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
+	list(APPEND INC_SYS
+		${SDL_INCLUDE_DIR}
+	)
 
 elseif(APPLE)
 	if(WITH_COCOA)
@@ -185,7 +187,9 @@ elseif(UNIX)
 		add_definitions(-DWITH_X11_XINPUT)
 	endif()
 
-	list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH})
+	list(APPEND INC_SYS
+		${X11_X11_INCLUDE_PATH}
+	)
 
 	list(APPEND SRC
 		intern/GHOST_DisplayManagerX11.cpp
@@ -205,7 +209,9 @@ elseif(UNIX)
 
 	if(X11_XF86keysym_INCLUDE_PATH)
 		add_definitions(-DWITH_XF86KEYSYM)
-		list(APPEND INC_SYS ${X11_XF86keysym_INCLUDE_PATH})
+		list(APPEND INC_SYS
+			${X11_XF86keysym_INCLUDE_PATH}
+		)
 	endif()
 
 elseif(WIN32)
@@ -213,7 +219,9 @@ elseif(WIN32)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
 	endif()
 
-	list(APPEND INC_SYS ${WINTAB_INC})
+	list(APPEND INC_SYS
+		${WINTAB_INC}
+	)
 
 	list(APPEND SRC
 		intern/GHOST_DisplayManagerWin32.cpp

intern/smoke/CMakeLists.txt

@@ -89,7 +89,9 @@ endif()
 
 if(WITH_FFTW3)
 	add_definitions(-DFFTW3=1)
-	list(APPEND INC ${FFTW3_INCLUDE_DIRS})
+	list(APPEND INC
+		${FFTW3_INCLUDE_DIRS}
+	)
 endif()
 
 blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}")

source/blender/blenfont/CMakeLists.txt

@@ -50,7 +50,9 @@ set(SRC
 )
 
 if(WITH_INTERNATIONAL)
-	list(APPEND INC_SYS ${GETTEXT_INC})
+	list(APPEND INC_SYS
+		${GETTEXT_INC}
+	)
 	add_definitions(-DINTERNATIONAL)
 endif()
 

source/blender/blenkernel/CMakeLists.txt

@@ -32,8 +32,10 @@ endif()
 set(INC 
 	.
 	../avi
+	../blenfont
 	../blenlib
 	../blenloader
+	../editors/include
 	../gpu
 	../ikplugin
 	../imbuf
@@ -41,18 +43,19 @@ set(INC
 	../makesrna
 	../modifiers
 	../nodes
-	../editors/include
 	../render/extern/include
-	../../../intern/bsp/extern ../blenfont
+	../../../intern/bsp/extern
 	../../../intern/decimation/extern
 	../../../intern/elbeem/extern
 	../../../intern/guardedalloc
 	../../../intern/iksolver/extern
 	../../../intern/memutil
+	../../../intern/mikktspace
 	../../../intern/opennl/extern
 	../../../intern/smoke/extern
-	../../../intern/mikktspace
+
-	../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h
+	# XXX - BAD LEVEL CALL WM_api.h
+	../../../source/blender/windowmanager
 )
 
 set(INC_SYS
@@ -243,12 +246,16 @@ if(WITH_AUDASPACE)
 endif()
 
 if(WITH_BULLET)
-	list(APPEND INC ../../../extern/bullet2/src)
+	list(APPEND INC
+		../../../extern/bullet2/src
+	)
 	add_definitions(-DUSE_BULLET)
 endif()
 
 if(WITH_MOD_CLOTH_ELTOPO)
-	list(APPEND INC ../../../extern/eltopo)
+	list(APPEND INC
+		../../../extern/eltopo
+	)
 	add_definitions(-DWITH_ELTOPO)
 endif()
 
@@ -277,20 +284,32 @@ if(WITH_IMAGE_HDR)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-	list(APPEND INC ../quicktime)
+	list(APPEND INC
-	list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+		../quicktime
+	)
+	list(APPEND INC_SYS
+		${QUICKTIME_INCLUDE_DIRS}
+	)
 	add_definitions(-DWITH_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-	list(APPEND INC ../../../intern/ffmpeg)
+	list(APPEND INC
-	list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
+		../../../intern/ffmpeg
+	)
+	list(APPEND INC_SYS
+		${FFMPEG_INCLUDE_DIRS}
+	)
 	add_definitions(-DWITH_FFMPEG)
 endif()
 
 if(WITH_PYTHON)
-	list(APPEND INC ../python)
+	list(APPEND INC
-	list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
+		../python
+	)
+	list(APPEND INC_SYS
+		${PYTHON_INCLUDE_DIRS}
+	)
 	add_definitions(-DWITH_PYTHON)
 
 	if(WITH_PYTHON_SECURITY)
@@ -315,12 +334,16 @@ if(WITH_JACK)
 endif()
 
 if(WITH_LZO)
-	list(APPEND INC_SYS ../../../extern/lzo/minilzo)
+	list(APPEND INC_SYS
+		../../../extern/lzo/minilzo
+	)
 	add_definitions(-DWITH_LZO)
 endif()
 
 if(WITH_LZMA)
-	list(APPEND INC_SYS ../../../extern/lzma)
+	list(APPEND INC_SYS
+		../../../extern/lzma
+	)
 	add_definitions(-DWITH_LZMA)
 endif()
 

source/blender/blenlib/CMakeLists.txt

@@ -138,7 +138,9 @@ set(SRC
 )
 
 if(WITH_BINRELOC)
-	list(APPEND INC_SYS "${BINRELOC_INCLUDE_DIRS}")
+	list(APPEND INC_SYS
+		${BINRELOC_INCLUDE_DIRS}
+	)
 	add_definitions(-DWITH_BINRELOC)
 endif()
 

source/blender/blenpluginapi/CMakeLists.txt

@@ -50,7 +50,9 @@ set(SRC
 )
 
 if(WITH_CODEC_QUICKTIME)
-	list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+	list(APPEND INC_SYS
+		${QUICKTIME_INCLUDE_DIRS}
+	)
 	add_definitions(-DWITH_QUICKTIME)
 endif()
 

source/blender/editors/render/CMakeLists.txt

@@ -51,8 +51,12 @@ set(SRC
 )
 
 if(WITH_CODEC_QUICKTIME)
-	list(APPEND INC ../../quicktime)
+	list(APPEND INC
-	list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+		../../quicktime
+	)
+	list(APPEND INC_SYS
+		${QUICKTIME_INCLUDE_DIRS}
+	)
 	add_definitions(-DWITH_QUICKTIME)
 endif()
 

source/blender/editors/space_script/CMakeLists.txt

@@ -44,8 +44,12 @@ set(SRC
 )
 
 if(WITH_PYTHON)
-	list(APPEND INC ../../python)
+	list(APPEND INC
-	list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
+		../../python
+	)
+	list(APPEND INC_SYS
+		${PYTHON_INCLUDE_DIRS}
+	)
 	add_definitions(-DWITH_PYTHON)
 endif()
 

source/blender/editors/space_text/CMakeLists.txt

@@ -46,8 +46,12 @@ set(SRC
 )
 
 if(WITH_PYTHON)
-	list(APPEND INC ../../python)
+	list(APPEND INC
-	list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
+		../../python
+	)
+	list(APPEND INC_SYS
+		${PYTHON_INCLUDE_DIRS}
+	)
 	add_definitions(-DWITH_PYTHON)
 endif()
 

source/blender/editors/space_view3d/CMakeLists.txt

@@ -61,7 +61,9 @@ set(SRC
 )
 
 if(WITH_GAMEENGINE)
-	list(APPEND INC ../../../../source/gameengine/BlenderRoutines)
+	list(APPEND INC
+		../../../../source/gameengine/BlenderRoutines
+	)
 	add_definitions(-DWITH_GAMEENGINE)
 endif()
 

source/blender/imbuf/CMakeLists.txt

@@ -113,29 +113,43 @@ if(WITH_IMAGE_OPENEXR)
 endif()
 
 if(WITH_IMAGE_TIFF)
-	list(APPEND INC_SYS ${TIFF_INCLUDE_DIR})
+	list(APPEND INC_SYS
+		${TIFF_INCLUDE_DIR}
+	)
 	add_definitions(-DWITH_TIFF)
 endif()
 
 if(WITH_IMAGE_OPENJPEG)
-	list(APPEND INC_SYS ${OPENJPEG_INCLUDE_DIRS})
+	list(APPEND INC_SYS
+		${OPENJPEG_INCLUDE_DIRS}
+	)
 	add_definitions(-DWITH_OPENJPEG)
 endif()
 
 if(WITH_IMAGE_REDCODE)
-	list(APPEND INC_SYS ${REDCODE_INC})
+	list(APPEND INC_SYS
+		${REDCODE_INC}
+	)
 	add_definitions(-DWITH_REDCODE)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-	list(APPEND INC ../quicktime)
+	list(APPEND INC
-	list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+		../quicktime
+	)
+	list(APPEND INC_SYS
+		${QUICKTIME_INCLUDE_DIRS}
+	)
 	add_definitions(-DWITH_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-	list(APPEND INC ../../../intern/ffmpeg)
+	list(APPEND INC
-	list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
+		../../../intern/ffmpeg
+	)
+	list(APPEND INC_SYS
+		${FFMPEG_INCLUDE_DIRS}
+	)
 	add_definitions(-DWITH_FFMPEG)
 endif()
 

source/blender/imbuf/intern/dds/CMakeLists.txt

@@ -28,7 +28,6 @@ set(INC
 	.
 	..
 	../..
-	intern/include
 	../../../blenlib
 	../../../blenkernel
 	../../../makesdna

source/blender/imbuf/intern/openexr/CMakeLists.txt

@@ -30,7 +30,6 @@ set(INC
 	../..
 	../../../blenkernel
 	../../../blenlib
-	intern/include
 	../../../../../intern/guardedalloc
 	../../../makesdna
 )
@@ -44,7 +43,9 @@ set(SRC
 )
 
 if(WITH_IMAGE_OPENEXR)
-	list(APPEND INC_SYS ${OPENEXR_INCLUDE_DIRS})
+	list(APPEND INC_SYS
+		${OPENEXR_INCLUDE_DIRS}
+	)
 	add_definitions(-DWITH_OPENEXR)
 endif()
 

source/blender/makesrna/intern/CMakeLists.txt

@@ -176,12 +176,16 @@ if(WITH_AUDASPACE)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-	list(APPEND INC ../../quicktime)
+	list(APPEND INC
+		../../quicktime
+	)
 	add_definitions(-DWITH_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-	list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
+	list(APPEND INC_SYS
+		${FFMPEG_INCLUDE_DIRS}
+	)
 	add_definitions(-DWITH_FFMPEG)
 endif()
 

source/blender/modifiers/CMakeLists.txt

@@ -25,7 +25,8 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC 
-	. ./intern
+	.
+	./intern
 	../blenlib
 	../blenloader
 	../makesdna
@@ -98,7 +99,9 @@ endif()
 
 if(WITH_MOD_DECIMATE)
 	add_definitions(-DWITH_MOD_DECIMATE)
-	list(APPEND INC ../../../intern/decimation/extern)
+	list(APPEND INC
+		../../../intern/decimation/extern
+	)
 endif()
 
 if(NOT WITH_MOD_FLUID)

source/blender/nodes/CMakeLists.txt

@@ -152,8 +152,12 @@ set(SRC
 )
 
 if(WITH_PYTHON)
-	list(APPEND INC ../python)
+	list(APPEND INC
-	list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
+		../python
+	)
+	list(APPEND INC_SYS
+		${PYTHON_INCLUDE_DIRS}
+	)
 	add_definitions(-DWITH_PYTHON)
 endif()
 

source/blender/python/intern/CMakeLists.txt

@@ -88,9 +88,6 @@ if(WITH_PYTHON_SAFETY)
 endif()
 
 if(WITH_AUDASPACE)
-	list(APPEND INC
-		../../../intern/audaspace/intern
-	)
 	add_definitions(-DWITH_AUDASPACE)
 endif()
 

source/blender/quicktime/CMakeLists.txt

@@ -26,17 +26,16 @@
 
 set(INC 
 	.
-	../quicktime
-	../makesdna
-	../makesrna
-	../blenlib
-	../blenkernel
 	../avi
+	../blenkernel
+	../blenlib
+	../blenloader
 	../imbuf
 	../imbuf/intern
-	../blenloader
+	../makesdna
+	../makesrna
+	../quicktime
 	../render/extern/include
-	../include
 	../windowmanager
 	../../../intern/guardedalloc
 )

source/blender/render/CMakeLists.txt

@@ -125,8 +125,12 @@ if(WITH_MOD_SMOKE)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-	list(APPEND INC ../quicktime)
+	list(APPEND INC
-	list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+		../quicktime
+	)
+	list(APPEND INC_SYS
+		${QUICKTIME_INCLUDE_DIRS}
+	)
 	add_definitions(-DWITH_QUICKTIME)
 endif()
 

source/blender/windowmanager/CMakeLists.txt

@@ -89,18 +89,26 @@ if(WITH_OPENCOLLADA)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-	list(APPEND INC ../quicktime)
+	list(APPEND INC
-	list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+		../quicktime
+	)
+	list(APPEND INC_SYS
+		${QUICKTIME_INCLUDE_DIRS}
+	)
 	add_definitions(-DWITH_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-	list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
+	list(APPEND INC_SYS
+		${FFMPEG_INCLUDE_DIRS}
+	)
 	add_definitions(-DWITH_FFMPEG)
 endif()
 
 if(WITH_PYTHON)
-	list(APPEND INC ../python)
+	list(APPEND INC
+		../python
+	)
 	add_definitions(-DWITH_PYTHON)
 
 	if(WITH_PYTHON_SECURITY)

source/gameengine/GameLogic/CMakeLists.txt

@@ -128,7 +128,9 @@ set(SRC
 )
 
 if(WITH_SDL)
-	list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
+	list(APPEND INC_SYS
+		${SDL_INCLUDE_DIR}
+	)
 else()
 	add_definitions(-DDISABLE_SDL)
 endif()

source/gameengine/Ketsji/CMakeLists.txt

@@ -210,7 +210,9 @@ set(SRC
 add_definitions(-DGLEW_STATIC)
 
 if(WITH_SDL)
-	list(APPEND INC_SYS ${SDL_INCLUDE_DIR})  
+	list(APPEND INC_SYS
+		${SDL_INCLUDE_DIR}
+	)
 else()
 	add_definitions(-DDISABLE_SDL)
 endif()