From 410c5e3cd284eba6b17c79042b161eaa9efe6e71 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 16 Jul 2011 23:01:14 +0000
Subject: cmake source definitions:   remove missing includes and use more
 strict formatting.

---
 intern/audaspace/CMakeLists.txt | 60 ++++++++++++++++++++++++++++++-----------
 1 file changed, 45 insertions(+), 15 deletions(-)

(limited to 'intern/audaspace')

diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt
index ab88c9ecabd..73ad0093c73 100644
--- a/intern/audaspace/CMakeLists.txt
+++ b/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_SYS ${FFMPEG_INCLUDE_DIRS})
+	list(APPEND INC
+		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_SYS ${SDL_INCLUDE_DIR})
+	list(APPEND INC
+		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_SYS ${OPENAL_INCLUDE_DIR})
+	list(APPEND INC
+		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_SYS ${JACK_INCLUDE_DIRS})
+	list(APPEND INC
+		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_SYS ${SNDFILE_INCLUDE_DIRS})
+	list(APPEND INC
+		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_SYS ${FFTW3_INCLUDE_DIRS})
+	list(APPEND INC
+		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_SYS ${PYTHON_INCLUDE_DIRS})
+	list(APPEND INC
+		Python
+	)
+	list(APPEND INC_SYS
+		${PYTHON_INCLUDE_DIRS}
+	)
 	list(APPEND SRC
 		Python/AUD_PyAPI.cpp
 
-- 
cgit v1.2.3


From 5792bd7cc74581a5ac37325207c1cc6a338be9c7 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 17 Jul 2011 09:11:13 +0000
Subject: cmake: cleanup include paths, some duplicates and going up some
 unneeded dirs.

---
 intern/audaspace/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'intern/audaspace')

diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt
index 73ad0093c73..7eef13b103b 100644
--- a/intern/audaspace/CMakeLists.txt
+++ b/intern/audaspace/CMakeLists.txt
@@ -22,9 +22,9 @@
 
 set(INC
 	.
-	intern
 	FX
 	SRC
+	intern
 	../ffmpeg
 )
 
-- 
cgit v1.2.3