From 09da9d43931a09e3786343e724a3de7217285d0d Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 31 May 2011 01:15:44 +0000
Subject: 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.

---
 source/blender/quicktime/CMakeLists.txt | 41 ++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 19 deletions(-)

(limited to 'source/blender/quicktime')

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}")
-- 
cgit v1.2.3