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.

4 files changed, 35 insertions, 22 deletions

diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index ed4508053b8..16bc7854617 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -39,6 +39,9 @@ set(INC
 	../../../intern/memutil
 	../../../intern/guardedalloc
 	../../../intern/ffmpeg
+)
+
+set(INC_SYS
 	${JPEG_INCLUDE_DIR}
 	${PNG_INCLUDE_DIR}
 	${ZLIB_INCLUDE_DIRS}
@@ -111,30 +114,28 @@ if(WITH_IMAGE_OPENEXR)
 endif()
 
 if(WITH_IMAGE_TIFF)
-	list(APPEND INC ${TIFF_INCLUDE_DIR})
+	list(APPEND INC_SYS ${TIFF_INCLUDE_DIR})
 	add_definitions(-DWITH_TIFF)
 endif()
 
 if(WITH_IMAGE_OPENJPEG)
-	list(APPEND INC ${OPENJPEG_INC})
+	list(APPEND INC_SYS ${OPENJPEG_INC})
 	add_definitions(-DWITH_OPENJPEG)
 endif()
 
 if(WITH_IMAGE_REDCODE)
-	list(APPEND INC ${REDCODE_INC})
+	list(APPEND INC_SYS ${REDCODE_INC})
 	add_definitions(-DWITH_REDCODE)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-	list(APPEND INC
-		../quicktime
-		${QUICKTIME_INC}
-	)
+	list(APPEND INC ../quicktime)
+	list(APPEND INC_SYS ${QUICKTIME_INC})
 	add_definitions(-DWITH_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-	list(APPEND INC ${FFMPEG_INC})
+	list(APPEND INC_SYS ${FFMPEG_INC})
 	add_definitions(-DWITH_FFMPEG)
 endif()
 
@@ -150,4 +151,4 @@ if(WITH_IMAGE_HDR)
 	add_definitions(-DWITH_HDR)
 endif()
 
-blender_add_lib(bf_imbuf "${SRC}" "${INC}")
+blender_add_lib(bf_imbuf "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt
index 92cba72c094..079f34af773 100644
--- a/source/blender/imbuf/intern/cineon/CMakeLists.txt
+++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt
@@ -25,14 +25,18 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC 
-		.
-		..
-		../..
-		../../../blenkernel
-		../../../blenloader
-		../../../blenlib
-		../../../makesdna
-		../../../../../intern/guardedalloc
+	.
+	..
+	../..
+	../../../blenkernel
+	../../../blenloader
+	../../../blenlib
+	../../../makesdna
+	../../../../../intern/guardedalloc
+)
+
+set(INC_SYS
+
 )
 
 set(SRC
@@ -44,4 +48,4 @@ set(SRC
 	logmemfile.c
 )
 
-blender_add_lib(bf_imbuf_cineon "${SRC}" "${INC}")
+blender_add_lib(bf_imbuf_cineon "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt
index 7564287ce4a..fd2b94547b4 100644
--- a/source/blender/imbuf/intern/dds/CMakeLists.txt
+++ b/source/blender/imbuf/intern/dds/CMakeLists.txt
@@ -28,13 +28,17 @@ set(INC
 	.
 	..
 	../..
-	./intern/include
+	intern/include
 	../../../blenlib
 	../../../blenkernel
 	../../../makesdna
 	../../../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
 	BlockDXT.cpp
 	ColorBlock.cpp
@@ -48,4 +52,4 @@ if(WITH_IMAGE_DDS)
 	add_definitions(-DWITH_DDS)
 endif()
 
-blender_add_lib(bf_imbuf_dds "${SRC}" "${INC}")                 
+blender_add_lib(bf_imbuf_dds "${SRC}" "${INC}" "${INC_SYS}")                 
diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt
index ace4f4f9a65..c1140bc59a9 100644
--- a/source/blender/imbuf/intern/openexr/CMakeLists.txt
+++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt
@@ -33,7 +33,10 @@ set(INC
 	intern/include
 	../../../../../intern/guardedalloc
 	../../../makesdna
-	${OPENEXR_INC}
+)
+
+set(INC_SYS
+
 )
 
 set(SRC
@@ -41,7 +44,8 @@ set(SRC
 )
 
 if(WITH_IMAGE_OPENEXR)
+	list(APPEND INC_SYS ${OPENEXR_INC})
 	add_definitions(-DWITH_OPENEXR)
 endif()
 
-blender_add_lib(bf_imbuf_openexr "${SRC}" "${INC}")                 
+blender_add_lib(bf_imbuf_openexr "${SRC}" "${INC}" "${INC_SYS}")