Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-05-31 05:15:44 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-05-31 05:15:44 +0400
commit09da9d43931a09e3786343e724a3de7217285d0d (patch)
tree4c48fbd4404687fd04254d071d535499a1ae4058 /extern/bullet2/CMakeLists.txt
parentdcd55cef86270f076cf827c5ae7a6cc76db4f9ad (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/bullet2/CMakeLists.txt')
-rw-r--r--extern/bullet2/CMakeLists.txt7
1 files changed, 5 insertions, 2 deletions
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}")