From 09da9d43931a09e3786343e724a3de7217285d0d Mon Sep 17 00:00:00 2001 From: Campbell Barton 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/makesrna/intern/CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'source/blender/makesrna/intern') diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 79edb91b972..4e4ff396e71 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -131,8 +131,14 @@ set(SRC ) set(INC + +) + +set(INC_SYS + ) + if(WITH_PYTHON) add_definitions(-DWITH_PYTHON) endif() @@ -171,7 +177,7 @@ if(WITH_CODEC_QUICKTIME) endif() if(WITH_CODEC_FFMPEG) - list(APPEND INC ${FFMPEG_INC}) + list(APPEND INC_SYS ${FFMPEG_INC}) add_definitions(-DWITH_FFMPEG) endif() @@ -217,6 +223,9 @@ blender_include_dirs( ../../../../intern/audaspace/intern ../../../../intern/guardedalloc ../../../../intern/memutil +) + +blender_include_dirs_sys( ${GLEW_INCLUDE_PATH} ) @@ -242,4 +251,4 @@ set(SRC rna_nodetree_types.h ) -blender_add_lib(bf_rna "${SRC}" "${INC}") +blender_add_lib(bf_rna "${SRC}" "${INC}" "${INC_SYS}") -- cgit v1.2.3