add missing bullet header to cmake, quiet reports from 'make test_cmake'
authorCampbell Barton <ideasman42@gmail.com>
Wed, 6 Feb 2013 04:16:28 +0000 (04:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 6 Feb 2013 04:16:28 +0000 (04:16 +0000)
build_files/cmake/cmake_consistency_check_config.py
extern/bullet2/CMakeLists.txt
intern/cycles/device/CMakeLists.txt

index 6b82e22..55bad25 100644 (file)
@@ -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
index c57474f..3d75794 100644 (file)
@@ -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
index 661d43a..fe2368b 100644 (file)
@@ -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