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. --- intern/elbeem/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'intern/elbeem/CMakeLists.txt') diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index dd23e854a25..7a842a29b98 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -26,6 +26,9 @@ set(INC extern +) + +set(INC_SYS ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} ) @@ -88,11 +91,11 @@ set(SRC add_definitions(-DNOGUI -DELBEEM_BLENDER=1) if(WINDOWS) - add_definitions(-DUSE_MSVC6FIXES) + add_definitions(-DUSE_MSVC6FIXES) endif() if(WITH_OPENMP) - add_definitions(-DPARALLEL=1) + add_definitions(-DPARALLEL=1) endif() -blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}") +blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}" "${INC_SYS}") -- cgit v1.2.3