diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-31 05:15:44 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-31 05:15:44 +0400 |
| commit | 09da9d43931a09e3786343e724a3de7217285d0d (patch) | |
| tree | 4c48fbd4404687fd04254d071d535499a1ae4058 /intern/ghost/CMakeLists.txt | |
| parent | dcd55cef86270f076cf827c5ae7a6cc76db4f9ad (diff) | |
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.
Diffstat (limited to 'intern/ghost/CMakeLists.txt')
| -rw-r--r-- | intern/ghost/CMakeLists.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index d42be400dff..065aa68dd3d 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -29,6 +29,9 @@ set(INC ../string ../../source/blender/imbuf ../../source/blender/makesdna +) + +set(INC_SYS ${GLEW_INCLUDE_PATH} ) @@ -123,7 +126,7 @@ elseif(UNIX) add_definitions(-DWITH_X11_XINPUT) endif() - list(APPEND INC ${X11_X11_INCLUDE_PATH}) + list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH}) list(APPEND SRC intern/GHOST_DisplayManagerX11.cpp @@ -143,7 +146,7 @@ elseif(UNIX) if(X11_XF86keysym_INCLUDE_PATH) add_definitions(-DWITH_XF86KEYSYM) - list(APPEND INC ${X11_XF86keysym_INCLUDE_PATH}) + list(APPEND INC_SYS ${X11_XF86keysym_INCLUDE_PATH}) endif() elseif(WIN32) @@ -151,7 +154,7 @@ elseif(WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") endif() - list(APPEND INC ${WINTAB_INC}) + list(APPEND INC_SYS ${WINTAB_INC}) list(APPEND SRC intern/GHOST_DisplayManagerWin32.cpp @@ -169,5 +172,5 @@ elseif(WIN32) ) endif() -blender_add_lib(bf_intern_ghost "${SRC}" "${INC}") +blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}") |