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 /extern | |
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 'extern')
-rw-r--r-- | extern/binreloc/CMakeLists.txt | 14 | ||||
-rw-r--r-- | extern/bullet2/CMakeLists.txt | 7 | ||||
-rw-r--r-- | extern/glew/CMakeLists.txt | 8 | ||||
-rw-r--r-- | extern/libopenjpeg/CMakeLists.txt | 6 | ||||
-rw-r--r-- | extern/libredcode/CMakeLists.txt | 5 | ||||
-rw-r--r-- | extern/lzma/CMakeLists.txt | 6 | ||||
-rw-r--r-- | extern/lzo/CMakeLists.txt | 6 |
7 files changed, 39 insertions, 13 deletions
diff --git a/extern/binreloc/CMakeLists.txt b/extern/binreloc/CMakeLists.txt index e3f0b05d563..a4f85a2fdfd 100644 --- a/extern/binreloc/CMakeLists.txt +++ b/extern/binreloc/CMakeLists.txt @@ -18,17 +18,21 @@ # All rights reserved. # +set(INC + ./include +) + +set(INC_SYS + +) + set(SRC binreloc.c include/binreloc.h ) -set(INC - ./include -) - add_definitions(-DENABLE_BINRELOC) -blender_add_lib(extern_binreloc "${SRC}" "${INC}") +blender_add_lib(extern_binreloc "${SRC}" "${INC}" "${INC_SYS}") diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt index a9137dd33f7..bfc4b31689e 100644 --- a/extern/bullet2/CMakeLists.txt +++ b/extern/bullet2/CMakeLists.txt @@ -29,6 +29,10 @@ set(INC src ) +set(INC_SYS + +) + set(SRC src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp @@ -145,7 +149,6 @@ set(SRC src/LinearMath/btGeometryUtil.cpp src/LinearMath/btQuickprof.cpp src/LinearMath/btSerializer.cpp - src/Bullet-C-Api.h src/BulletCollision/BroadphaseCollision/btAxisSweep3.h @@ -330,4 +333,4 @@ if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") endif() -blender_add_lib(extern_bullet "${SRC}" "${INC}") +blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}") diff --git a/extern/glew/CMakeLists.txt b/extern/glew/CMakeLists.txt index 1a20dbdb9d7..35beacab6a3 100644 --- a/extern/glew/CMakeLists.txt +++ b/extern/glew/CMakeLists.txt @@ -28,8 +28,12 @@ set(INC ./include ) +set(INC_SYS + +) + if(UNIX) - list(APPEND INC ${X11_X11_INCLUDE_PATH}) + list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH}) endif() set(SRC @@ -42,4 +46,4 @@ set(SRC add_definitions(-DGLEW_STATIC) -blender_add_lib(extern_glew "${SRC}" "${INC}") +blender_add_lib(extern_glew "${SRC}" "${INC}" "${INC_SYS}") diff --git a/extern/libopenjpeg/CMakeLists.txt b/extern/libopenjpeg/CMakeLists.txt index c5ba1363246..fe03db83054 100644 --- a/extern/libopenjpeg/CMakeLists.txt +++ b/extern/libopenjpeg/CMakeLists.txt @@ -28,6 +28,10 @@ set(INC . ) +set(INC_SYS + +) + set(SRC bio.c cio.c @@ -73,4 +77,4 @@ set(SRC tgt.h ) -blender_add_lib(extern_openjpeg "${SRC}" "${INC}") +blender_add_lib(extern_openjpeg "${SRC}" "${INC}" "${INC_SYS}") diff --git a/extern/libredcode/CMakeLists.txt b/extern/libredcode/CMakeLists.txt index 20ad6ae9f7d..1c4daac42d1 100644 --- a/extern/libredcode/CMakeLists.txt +++ b/extern/libredcode/CMakeLists.txt @@ -26,6 +26,9 @@ set(INC . +) + +set(INC_SYS ../libopenjpeg ) @@ -39,4 +42,4 @@ set(SRC format.h ) -blender_add_lib(extern_redcode "${SRC}" "${INC}") +blender_add_lib(extern_redcode "${SRC}" "${INC}" "${INC_SYS}") diff --git a/extern/lzma/CMakeLists.txt b/extern/lzma/CMakeLists.txt index 710165d2496..bfb52591e08 100644 --- a/extern/lzma/CMakeLists.txt +++ b/extern/lzma/CMakeLists.txt @@ -28,6 +28,10 @@ set(INC . ) +set(INC_SYS + +) + set(SRC Alloc.c LzFind.c @@ -44,4 +48,4 @@ set(SRC Types.h ) -blender_add_lib(extern_lzma "${SRC}" "${INC}") +blender_add_lib(extern_lzma "${SRC}" "${INC}" "${INC_SYS}") diff --git a/extern/lzo/CMakeLists.txt b/extern/lzo/CMakeLists.txt index 17728aad43e..10ea2c58f7c 100644 --- a/extern/lzo/CMakeLists.txt +++ b/extern/lzo/CMakeLists.txt @@ -28,6 +28,10 @@ set(INC include ) +set(INC_SYS + +) + set(SRC minilzo/minilzo.c @@ -36,4 +40,4 @@ set(SRC minilzo/minilzo.h ) -blender_add_lib(extern_minilzo "${SRC}" "${INC}") +blender_add_lib(extern_minilzo "${SRC}" "${INC}" "${INC_SYS}") |