diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-02-06 08:16:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-02-06 08:16:28 +0400 |
| commit | a78cf854b4c811d5df24d10cf3b9a0d9d6679ca0 (patch) | |
| tree | f86bf5e44ff35ef06af5c27dad4fa5aa1f43d72a | |
| parent | 441c7fb79a83b7d6f9e86cd2a3b0c8eaeec6d07c (diff) | |
add missing bullet header to cmake, quiet reports from 'make test_cmake'
| -rw-r--r-- | build_files/cmake/cmake_consistency_check_config.py | 21 | ||||
| -rw-r--r-- | extern/bullet2/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | intern/cycles/device/CMakeLists.txt | 4 |
3 files changed, 27 insertions, 3 deletions
diff --git a/build_files/cmake/cmake_consistency_check_config.py b/build_files/cmake/cmake_consistency_check_config.py index 6b82e224a32..55bad251a53 100644 --- a/build_files/cmake/cmake_consistency_check_config.py +++ b/build_files/cmake/cmake_consistency_check_config.py @@ -29,6 +29,22 @@ IGNORE = ( "extern/recastnavigation/Recast/Source/RecastTimer.cpp", "intern/audaspace/SRC/AUD_SRCResampleFactory.cpp", "intern/audaspace/SRC/AUD_SRCResampleReader.cpp", + "intern/cycles/render/film_response.cpp", + "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc", + "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc", + "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc", + "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc", + "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc", + "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc", + "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc", + "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc", + "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc", + "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc", + "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc", + "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc", + "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc", + "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc", + "extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc", "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h", "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h", @@ -47,6 +63,11 @@ IGNORE = ( "extern/recastnavigation/Recast/Include/RecastTimer.h", "intern/audaspace/SRC/AUD_SRCResampleFactory.h", "intern/audaspace/SRC/AUD_SRCResampleReader.h", + "intern/cycles/render/film_response.h", + "extern/carve/include/carve/config.h", + "extern/carve/include/carve/external/boost/random.hpp", + "extern/carve/patches/files/config.h", + "extern/carve/patches/files/random.hpp", ) UTF8_CHECK = True diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt index c57474f99f2..3d757947980 100644 --- a/extern/bullet2/CMakeLists.txt +++ b/extern/bullet2/CMakeLists.txt @@ -242,14 +242,15 @@ set(SRC src/BulletCollision/CollisionShapes/btUniformScalingShape.h src/BulletCollision/Gimpact/btBoxCollision.h src/BulletCollision/Gimpact/btClipPolygon.h + src/BulletCollision/Gimpact/btCompoundFromGimpact.h src/BulletCollision/Gimpact/btContactProcessing.h - src/BulletCollision/Gimpact/btGenericPoolAllocator.h - src/BulletCollision/Gimpact/btGeometryOperations.h src/BulletCollision/Gimpact/btGImpactBvh.h src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h src/BulletCollision/Gimpact/btGImpactMassUtil.h src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h src/BulletCollision/Gimpact/btGImpactShape.h + src/BulletCollision/Gimpact/btGenericPoolAllocator.h + src/BulletCollision/Gimpact/btGeometryOperations.h src/BulletCollision/Gimpact/btQuantization.h src/BulletCollision/Gimpact/btTriangleShapeEx.h src/BulletCollision/Gimpact/gim_array.h diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt index 661d43ab036..fe2368b7ea8 100644 --- a/intern/cycles/device/CMakeLists.txt +++ b/intern/cycles/device/CMakeLists.txt @@ -23,7 +23,9 @@ set(SRC ) if(WITH_NETWORK) - list(APPEND SRC device_network.cpp) + list(APPEND SRC + device_network.cpp + ) endif() set(SRC_HEADERS |