[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54348] trunk/blender: add missing bullet header to cmake, quiet reports from 'make test_cmake'

Campbell Barton ideasman42 at gmail.com
Wed Feb 6 05:16:29 CET 2013


Revision: 54348
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54348
Author:   campbellbarton
Date:     2013-02-06 04:16:28 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
add missing bullet header to cmake, quiet reports from 'make test_cmake'

Modified Paths:
--------------
    trunk/blender/build_files/cmake/cmake_consistency_check_config.py
    trunk/blender/extern/bullet2/CMakeLists.txt
    trunk/blender/intern/cycles/device/CMakeLists.txt

Modified: trunk/blender/build_files/cmake/cmake_consistency_check_config.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_consistency_check_config.py	2013-02-06 02:48:03 UTC (rev 54347)
+++ trunk/blender/build_files/cmake/cmake_consistency_check_config.py	2013-02-06 04:16:28 UTC (rev 54348)
@@ -29,6 +29,22 @@
     "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 @@
     "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

Modified: trunk/blender/extern/bullet2/CMakeLists.txt
===================================================================
--- trunk/blender/extern/bullet2/CMakeLists.txt	2013-02-06 02:48:03 UTC (rev 54347)
+++ trunk/blender/extern/bullet2/CMakeLists.txt	2013-02-06 04:16:28 UTC (rev 54348)
@@ -242,14 +242,15 @@
 	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

Modified: trunk/blender/intern/cycles/device/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/device/CMakeLists.txt	2013-02-06 02:48:03 UTC (rev 54347)
+++ trunk/blender/intern/cycles/device/CMakeLists.txt	2013-02-06 04:16:28 UTC (rev 54348)
@@ -23,7 +23,9 @@
 )
 
 if(WITH_NETWORK)
-	list(APPEND SRC device_network.cpp)
+	list(APPEND SRC
+		device_network.cpp
+	)
 endif()
 
 set(SRC_HEADERS




More information about the Bf-blender-cvs mailing list