Commit: 4baa2fdcfe2faabe6acd333926ac957ab8b165d2
Author: Campbell Barton
Date: Thu Jun 19 04:35:15 2014 +1000
https://developer.blender.org/rB4baa2fdcfe2faabe6acd333926ac957ab8b165d2
Correction to GTest commit (WITH_GTEST=OFF works now)
===================================================================
M extern/libmv/CMakeLists.txt
M extern/libmv/bundle.sh
===================================================================
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
index 15a4fc7..e1595ce 100644
--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
@@ -171,37 +171,37 @@ if(WITH_LIBMV)
if(WITH_GTESTS)
blender_add_lib(libmv_test_dataset
"./libmv/multiview/test_data_sets.cc" "" "")
- endif()
- BLENDER_SRC_GTEST("libmv_scoped_ptr" "./libmv/base/scoped_ptr_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_vector" "./libmv/base/vector_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_array_nd" "./libmv/image/array_nd_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_convolve" "./libmv/image/convolve_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_image" "./libmv/image/image_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_sample" "./libmv/image/sample_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_tuple" "./libmv/image/tuple_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_euclidean_resection"
"./libmv/multiview/euclidean_resection_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_fundamental"
"./libmv/multiview/fundamental_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_homography"
"./libmv/multiview/homography_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_nviewtriangulation"
"./libmv/multiview/nviewtriangulation_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_panography"
"./libmv/multiview/panography_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_projection"
"./libmv/multiview/projection_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_resection"
"./libmv/multiview/resection_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_triangulation"
"./libmv/multiview/triangulation_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_dogleg" "./libmv/numeric/dogleg_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_function_derivative"
"./libmv/numeric/function_derivative_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_levenberg_marquardt"
"./libmv/numeric/levenberg_marquardt_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_numeric" "./libmv/numeric/numeric_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_poly" "./libmv/numeric/poly_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_camera_intrinsics"
"./libmv/simple_pipeline/camera_intrinsics_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_detect"
"./libmv/simple_pipeline/detect_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_intersect"
"./libmv/simple_pipeline/intersect_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_keyframe_selection"
"./libmv/simple_pipeline/keyframe_selection_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_modal_solver"
"./libmv/simple_pipeline/modal_solver_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_resect"
"./libmv/simple_pipeline/resect_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_brute_region_tracker"
"./libmv/tracking/brute_region_tracker_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_klt_region_tracker"
"./libmv/tracking/klt_region_tracker_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
- BLENDER_SRC_GTEST("libmv_pyramid_region_tracker"
"./libmv/tracking/pyramid_region_tracker_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_scoped_ptr"
"./libmv/base/scoped_ptr_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_vector" "./libmv/base/vector_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_array_nd"
"./libmv/image/array_nd_test.cc" "libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_convolve"
"./libmv/image/convolve_test.cc" "libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_image" "./libmv/image/image_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_sample" "./libmv/image/sample_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_tuple" "./libmv/image/tuple_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_euclidean_resection"
"./libmv/multiview/euclidean_resection_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_fundamental"
"./libmv/multiview/fundamental_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_homography"
"./libmv/multiview/homography_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_nviewtriangulation"
"./libmv/multiview/nviewtriangulation_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_panography"
"./libmv/multiview/panography_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_projection"
"./libmv/multiview/projection_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_resection"
"./libmv/multiview/resection_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_triangulation"
"./libmv/multiview/triangulation_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_dogleg"
"./libmv/numeric/dogleg_test.cc" "libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_function_derivative"
"./libmv/numeric/function_derivative_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_levenberg_marquardt"
"./libmv/numeric/levenberg_marquardt_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_numeric"
"./libmv/numeric/numeric_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_poly" "./libmv/numeric/poly_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_camera_intrinsics"
"./libmv/simple_pipeline/camera_intrinsics_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_detect"
"./libmv/simple_pipeline/detect_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_intersect"
"./libmv/simple_pipeline/intersect_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_keyframe_selection"
"./libmv/simple_pipeline/keyframe_selection_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_modal_solver"
"./libmv/simple_pipeline/modal_solver_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_resect"
"./libmv/simple_pipeline/resect_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_brute_region_tracker"
"./libmv/tracking/brute_region_tracker_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_klt_region_tracker"
"./libmv/tracking/klt_region_tracker_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ BLENDER_SRC_GTEST("libmv_pyramid_region_tracker"
"./libmv/tracking/pyramid_region_tracker_test.cc"
"libmv_test_dataset;extern_libmv;extern_ceres")
+ endif()
else()
list(APPEND SRC
libmv-capi_stub.cc
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh
index 53858a1..32f7311 100755
--- a/extern/libmv/bundle.sh
+++ b/extern/libmv/bundle.sh
@@ -42,7 +42,7 @@ third_glog_headers=`find ./third_party -type f -iname '*.h' |
grep glog | grep -
third_gflags_sources=`find ./third_party -type f -iname '*.cc' -or -iname
'*.cpp' -or -iname '*.c' | grep gflags | grep -v windows | sed -r
's/^\.\//\t\t/' | sort -d`
third_gflags_headers=`find ./third_party -type f -iname '*.h' | grep gflags |
grep -v windows | sed -r 's/^\.\//\t\t/' | sort -d`
-tests=`find ./libmv -type f -iname '*_test.cc' | sort -d | awk ' {
name=gensub(".*/([A-Za-z_]+)_test.cc", "\\\\1", $1);
printf("\tBLENDER_SRC_GTEST(\"libmv_%s\" \"%s\"
\"libmv_test_dataset;extern_libmv;extern_ceres\")\n", name, $1) } '`
+tests=`find ./libmv -type f -iname '*_test.cc' | sort -d | awk ' {
name=gensub(".*/([A-Za-z_]+)_test.cc", "\\\\1", $1);
printf("\t\tBLENDER_SRC_GTEST(\"libmv_%s\" \"%s\"
\"libmv_test_dataset;extern_libmv;extern_ceres\")\n", name, $1) } '`
src_dir=`find ./libmv -type f -iname '*.cc' -exec dirname {} \; -or -iname
'*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \; | sed -r
's/^\.\//\t\t/' | sort -d | uniq`
src_third_dir=`find ./third_party -type f -iname '*.cc' -exec dirname {} \;
-or -iname '*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \; |
grep -v ceres | sed -r 's/^\.\//\t\t/' | sort -d | uniq`
@@ -177,9 +177,9 @@ ${third_headers}
if(WITH_GTESTS)
blender_add_lib(libmv_test_dataset
"./libmv/multiview/test_data_sets.cc" "${INC}" "${INC_SYS}")
- endif()
${tests}
+ endif()
else()
list(APPEND SRC
libmv-capi_stub.cc
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
