Move Ceres to extern/
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 4 Jan 2016 13:11:12 +0000 (18:11 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 4 Jan 2016 14:39:13 +0000 (19:39 +0500)
Even tho it's currently only used by Libmv we might use it for something
else in the future. Plus, it's actually where it logically belongs to.

265 files changed:
CMakeLists.txt
extern/CMakeLists.txt
extern/ceres/CMakeLists.txt [moved from extern/libmv/third_party/ceres/CMakeLists.txt with 97% similarity]
extern/ceres/ChangeLog [moved from extern/libmv/third_party/ceres/ChangeLog with 100% similarity]
extern/ceres/LICENSE [moved from extern/libmv/third_party/ceres/LICENSE with 100% similarity]
extern/ceres/README [moved from extern/libmv/third_party/ceres/README with 100% similarity]
extern/ceres/bundle.sh [moved from extern/libmv/third_party/ceres/bundle.sh with 97% similarity]
extern/ceres/config/ceres/internal/config.h [moved from extern/libmv/third_party/ceres/config/ceres/internal/config.h with 100% similarity]
extern/ceres/files.txt [moved from extern/libmv/third_party/ceres/files.txt with 100% similarity]
extern/ceres/include/ceres/autodiff_cost_function.h [moved from extern/libmv/third_party/ceres/include/ceres/autodiff_cost_function.h with 100% similarity]
extern/ceres/include/ceres/autodiff_local_parameterization.h [moved from extern/libmv/third_party/ceres/include/ceres/autodiff_local_parameterization.h with 100% similarity]
extern/ceres/include/ceres/c_api.h [moved from extern/libmv/third_party/ceres/include/ceres/c_api.h with 100% similarity]
extern/ceres/include/ceres/ceres.h [moved from extern/libmv/third_party/ceres/include/ceres/ceres.h with 100% similarity]
extern/ceres/include/ceres/conditioned_cost_function.h [moved from extern/libmv/third_party/ceres/include/ceres/conditioned_cost_function.h with 100% similarity]
extern/ceres/include/ceres/cost_function.h [moved from extern/libmv/third_party/ceres/include/ceres/cost_function.h with 100% similarity]
extern/ceres/include/ceres/cost_function_to_functor.h [moved from extern/libmv/third_party/ceres/include/ceres/cost_function_to_functor.h with 100% similarity]
extern/ceres/include/ceres/covariance.h [moved from extern/libmv/third_party/ceres/include/ceres/covariance.h with 100% similarity]
extern/ceres/include/ceres/crs_matrix.h [moved from extern/libmv/third_party/ceres/include/ceres/crs_matrix.h with 100% similarity]
extern/ceres/include/ceres/dynamic_autodiff_cost_function.h [moved from extern/libmv/third_party/ceres/include/ceres/dynamic_autodiff_cost_function.h with 100% similarity]
extern/ceres/include/ceres/dynamic_cost_function_to_functor.h [moved from extern/libmv/third_party/ceres/include/ceres/dynamic_cost_function_to_functor.h with 100% similarity]
extern/ceres/include/ceres/dynamic_numeric_diff_cost_function.h [moved from extern/libmv/third_party/ceres/include/ceres/dynamic_numeric_diff_cost_function.h with 100% similarity]
extern/ceres/include/ceres/fpclassify.h [moved from extern/libmv/third_party/ceres/include/ceres/fpclassify.h with 100% similarity]
extern/ceres/include/ceres/gradient_checker.h [moved from extern/libmv/third_party/ceres/include/ceres/gradient_checker.h with 100% similarity]
extern/ceres/include/ceres/gradient_problem.h [moved from extern/libmv/third_party/ceres/include/ceres/gradient_problem.h with 100% similarity]
extern/ceres/include/ceres/gradient_problem_solver.h [moved from extern/libmv/third_party/ceres/include/ceres/gradient_problem_solver.h with 100% similarity]
extern/ceres/include/ceres/internal/autodiff.h [moved from extern/libmv/third_party/ceres/include/ceres/internal/autodiff.h with 100% similarity]
extern/ceres/include/ceres/internal/disable_warnings.h [moved from extern/libmv/third_party/ceres/include/ceres/internal/disable_warnings.h with 100% similarity]
extern/ceres/include/ceres/internal/eigen.h [moved from extern/libmv/third_party/ceres/include/ceres/internal/eigen.h with 100% similarity]
extern/ceres/include/ceres/internal/fixed_array.h [moved from extern/libmv/third_party/ceres/include/ceres/internal/fixed_array.h with 100% similarity]
extern/ceres/include/ceres/internal/macros.h [moved from extern/libmv/third_party/ceres/include/ceres/internal/macros.h with 100% similarity]
extern/ceres/include/ceres/internal/manual_constructor.h [moved from extern/libmv/third_party/ceres/include/ceres/internal/manual_constructor.h with 100% similarity]
extern/ceres/include/ceres/internal/numeric_diff.h [moved from extern/libmv/third_party/ceres/include/ceres/internal/numeric_diff.h with 100% similarity]
extern/ceres/include/ceres/internal/port.h [moved from extern/libmv/third_party/ceres/include/ceres/internal/port.h with 100% similarity]
extern/ceres/include/ceres/internal/reenable_warnings.h [moved from extern/libmv/third_party/ceres/include/ceres/internal/reenable_warnings.h with 100% similarity]
extern/ceres/include/ceres/internal/scoped_ptr.h [moved from extern/libmv/third_party/ceres/include/ceres/internal/scoped_ptr.h with 100% similarity]
extern/ceres/include/ceres/internal/variadic_evaluate.h [moved from extern/libmv/third_party/ceres/include/ceres/internal/variadic_evaluate.h with 100% similarity]
extern/ceres/include/ceres/iteration_callback.h [moved from extern/libmv/third_party/ceres/include/ceres/iteration_callback.h with 100% similarity]
extern/ceres/include/ceres/jet.h [moved from extern/libmv/third_party/ceres/include/ceres/jet.h with 100% similarity]
extern/ceres/include/ceres/local_parameterization.h [moved from extern/libmv/third_party/ceres/include/ceres/local_parameterization.h with 100% similarity]
extern/ceres/include/ceres/loss_function.h [moved from extern/libmv/third_party/ceres/include/ceres/loss_function.h with 100% similarity]
extern/ceres/include/ceres/normal_prior.h [moved from extern/libmv/third_party/ceres/include/ceres/normal_prior.h with 100% similarity]
extern/ceres/include/ceres/numeric_diff_cost_function.h [moved from extern/libmv/third_party/ceres/include/ceres/numeric_diff_cost_function.h with 100% similarity]
extern/ceres/include/ceres/numeric_diff_options.h [moved from extern/libmv/third_party/ceres/include/ceres/numeric_diff_options.h with 100% similarity]
extern/ceres/include/ceres/ordered_groups.h [moved from extern/libmv/third_party/ceres/include/ceres/ordered_groups.h with 100% similarity]
extern/ceres/include/ceres/problem.h [moved from extern/libmv/third_party/ceres/include/ceres/problem.h with 100% similarity]
extern/ceres/include/ceres/rotation.h [moved from extern/libmv/third_party/ceres/include/ceres/rotation.h with 100% similarity]
extern/ceres/include/ceres/sized_cost_function.h [moved from extern/libmv/third_party/ceres/include/ceres/sized_cost_function.h with 100% similarity]
extern/ceres/include/ceres/solver.h [moved from extern/libmv/third_party/ceres/include/ceres/solver.h with 100% similarity]
extern/ceres/include/ceres/types.h [moved from extern/libmv/third_party/ceres/include/ceres/types.h with 100% similarity]
extern/ceres/include/ceres/version.h [moved from extern/libmv/third_party/ceres/include/ceres/version.h with 100% similarity]
extern/ceres/internal/ceres/array_utils.cc [moved from extern/libmv/third_party/ceres/internal/ceres/array_utils.cc with 100% similarity]
extern/ceres/internal/ceres/array_utils.h [moved from extern/libmv/third_party/ceres/internal/ceres/array_utils.h with 100% similarity]
extern/ceres/internal/ceres/blas.cc [moved from extern/libmv/third_party/ceres/internal/ceres/blas.cc with 100% similarity]
extern/ceres/internal/ceres/blas.h [moved from extern/libmv/third_party/ceres/internal/ceres/blas.h with 100% similarity]
extern/ceres/internal/ceres/block_evaluate_preparer.cc [moved from extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.cc with 100% similarity]
extern/ceres/internal/ceres/block_evaluate_preparer.h [moved from extern/libmv/third_party/ceres/internal/ceres/block_evaluate_preparer.h with 100% similarity]
extern/ceres/internal/ceres/block_jacobi_preconditioner.cc [moved from extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.cc with 100% similarity]
extern/ceres/internal/ceres/block_jacobi_preconditioner.h [moved from extern/libmv/third_party/ceres/internal/ceres/block_jacobi_preconditioner.h with 100% similarity]
extern/ceres/internal/ceres/block_jacobian_writer.cc [moved from extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.cc with 100% similarity]
extern/ceres/internal/ceres/block_jacobian_writer.h [moved from extern/libmv/third_party/ceres/internal/ceres/block_jacobian_writer.h with 100% similarity]
extern/ceres/internal/ceres/block_random_access_dense_matrix.cc [moved from extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.cc with 100% similarity]
extern/ceres/internal/ceres/block_random_access_dense_matrix.h [moved from extern/libmv/third_party/ceres/internal/ceres/block_random_access_dense_matrix.h with 100% similarity]
extern/ceres/internal/ceres/block_random_access_diagonal_matrix.cc [moved from extern/libmv/third_party/ceres/internal/ceres/block_random_access_diagonal_matrix.cc with 100% similarity]
extern/ceres/internal/ceres/block_random_access_diagonal_matrix.h [moved from extern/libmv/third_party/ceres/internal/ceres/block_random_access_diagonal_matrix.h with 100% similarity]
extern/ceres/internal/ceres/block_random_access_matrix.cc [moved from extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.cc with 100% similarity]
extern/ceres/internal/ceres/block_random_access_matrix.h [moved from extern/libmv/third_party/ceres/internal/ceres/block_random_access_matrix.h with 100% similarity]
extern/ceres/internal/ceres/block_random_access_sparse_matrix.cc [moved from extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.cc with 100% similarity]
extern/ceres/internal/ceres/block_random_access_sparse_matrix.h [moved from extern/libmv/third_party/ceres/internal/ceres/block_random_access_sparse_matrix.h with 100% similarity]
extern/ceres/internal/ceres/block_sparse_matrix.cc [moved from extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.cc with 100% similarity]
extern/ceres/internal/ceres/block_sparse_matrix.h [moved from extern/libmv/third_party/ceres/internal/ceres/block_sparse_matrix.h with 100% similarity]
extern/ceres/internal/ceres/block_structure.cc [moved from extern/libmv/third_party/ceres/internal/ceres/block_structure.cc with 100% similarity]
extern/ceres/internal/ceres/block_structure.h [moved from extern/libmv/third_party/ceres/internal/ceres/block_structure.h with 100% similarity]
extern/ceres/internal/ceres/c_api.cc [moved from extern/libmv/third_party/ceres/internal/ceres/c_api.cc with 100% similarity]
extern/ceres/internal/ceres/callbacks.cc [moved from extern/libmv/third_party/ceres/internal/ceres/callbacks.cc with 100% similarity]
extern/ceres/internal/ceres/callbacks.h [moved from extern/libmv/third_party/ceres/internal/ceres/callbacks.h with 100% similarity]
extern/ceres/internal/ceres/casts.h [moved from extern/libmv/third_party/ceres/internal/ceres/casts.h with 100% similarity]
extern/ceres/internal/ceres/cgnr_linear_operator.h [moved from extern/libmv/third_party/ceres/internal/ceres/cgnr_linear_operator.h with 100% similarity]
extern/ceres/internal/ceres/cgnr_solver.cc [moved from extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.cc with 100% similarity]
extern/ceres/internal/ceres/cgnr_solver.h [moved from extern/libmv/third_party/ceres/internal/ceres/cgnr_solver.h with 100% similarity]
extern/ceres/internal/ceres/collections_port.h [moved from extern/libmv/third_party/ceres/internal/ceres/collections_port.h with 100% similarity]
extern/ceres/internal/ceres/compressed_col_sparse_matrix_utils.cc [moved from extern/libmv/third_party/ceres/internal/ceres/compressed_col_sparse_matrix_utils.cc with 100% similarity]
extern/ceres/internal/ceres/compressed_col_sparse_matrix_utils.h [moved from extern/libmv/third_party/ceres/internal/ceres/compressed_col_sparse_matrix_utils.h with 100% similarity]
extern/ceres/internal/ceres/compressed_row_jacobian_writer.cc [moved from extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.cc with 100% similarity]
extern/ceres/internal/ceres/compressed_row_jacobian_writer.h [moved from extern/libmv/third_party/ceres/internal/ceres/compressed_row_jacobian_writer.h with 100% similarity]
extern/ceres/internal/ceres/compressed_row_sparse_matrix.cc [moved from extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.cc with 100% similarity]
extern/ceres/internal/ceres/compressed_row_sparse_matrix.h [moved from extern/libmv/third_party/ceres/internal/ceres/compressed_row_sparse_matrix.h with 100% similarity]
extern/ceres/internal/ceres/conditioned_cost_function.cc [moved from extern/libmv/third_party/ceres/internal/ceres/conditioned_cost_function.cc with 100% similarity]
extern/ceres/internal/ceres/conjugate_gradients_solver.cc [moved from extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.cc with 100% similarity]
extern/ceres/internal/ceres/conjugate_gradients_solver.h [moved from extern/libmv/third_party/ceres/internal/ceres/conjugate_gradients_solver.h with 100% similarity]
extern/ceres/internal/ceres/coordinate_descent_minimizer.cc [moved from extern/libmv/third_party/ceres/internal/ceres/coordinate_descent_minimizer.cc with 100% similarity]
extern/ceres/internal/ceres/coordinate_descent_minimizer.h [moved from extern/libmv/third_party/ceres/internal/ceres/coordinate_descent_minimizer.h with 100% similarity]
extern/ceres/internal/ceres/corrector.cc [moved from extern/libmv/third_party/ceres/internal/ceres/corrector.cc with 100% similarity]
extern/ceres/internal/ceres/corrector.h [moved from extern/libmv/third_party/ceres/internal/ceres/corrector.h with 100% similarity]
extern/ceres/internal/ceres/covariance.cc [moved from extern/libmv/third_party/ceres/internal/ceres/covariance.cc with 100% similarity]
extern/ceres/internal/ceres/covariance_impl.cc [moved from extern/libmv/third_party/ceres/internal/ceres/covariance_impl.cc with 100% similarity]
extern/ceres/internal/ceres/covariance_impl.h [moved from extern/libmv/third_party/ceres/internal/ceres/covariance_impl.h with 100% similarity]
extern/ceres/internal/ceres/cxsparse.h [moved from extern/libmv/third_party/ceres/internal/ceres/cxsparse.h with 100% similarity]
extern/ceres/internal/ceres/dense_jacobian_writer.h [moved from extern/libmv/third_party/ceres/internal/ceres/dense_jacobian_writer.h with 100% similarity]
extern/ceres/internal/ceres/dense_normal_cholesky_solver.cc [moved from extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.cc with 100% similarity]
extern/ceres/internal/ceres/dense_normal_cholesky_solver.h [moved from extern/libmv/third_party/ceres/internal/ceres/dense_normal_cholesky_solver.h with 100% similarity]
extern/ceres/internal/ceres/dense_qr_solver.cc [moved from extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.cc with 100% similarity]
extern/ceres/internal/ceres/dense_qr_solver.h [moved from extern/libmv/third_party/ceres/internal/ceres/dense_qr_solver.h with 100% similarity]
extern/ceres/internal/ceres/dense_sparse_matrix.cc [moved from extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.cc with 100% similarity]
extern/ceres/internal/ceres/dense_sparse_matrix.h [moved from extern/libmv/third_party/ceres/internal/ceres/dense_sparse_matrix.h with 100% similarity]
extern/ceres/internal/ceres/detect_structure.cc [moved from extern/libmv/third_party/ceres/internal/ceres/detect_structure.cc with 100% similarity]
extern/ceres/internal/ceres/detect_structure.h [moved from extern/libmv/third_party/ceres/internal/ceres/detect_structure.h with 100% similarity]
extern/ceres/internal/ceres/dogleg_strategy.cc [moved from extern/libmv/third_party/ceres/internal/ceres/dogleg_strategy.cc with 100% similarity]
extern/ceres/internal/ceres/dogleg_strategy.h [moved from extern/libmv/third_party/ceres/internal/ceres/dogleg_strategy.h with 100% similarity]
extern/ceres/internal/ceres/dynamic_compressed_row_finalizer.h [moved from extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_finalizer.h with 100% similarity]
extern/ceres/internal/ceres/dynamic_compressed_row_jacobian_writer.cc [moved from extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_jacobian_writer.cc with 100% similarity]
extern/ceres/internal/ceres/dynamic_compressed_row_jacobian_writer.h [moved from extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_jacobian_writer.h with 100% similarity]
extern/ceres/internal/ceres/dynamic_compressed_row_sparse_matrix.cc [moved from extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_sparse_matrix.cc with 100% similarity]
extern/ceres/internal/ceres/dynamic_compressed_row_sparse_matrix.h [moved from extern/libmv/third_party/ceres/internal/ceres/dynamic_compressed_row_sparse_matrix.h with 100% similarity]
extern/ceres/internal/ceres/evaluator.cc [moved from extern/libmv/third_party/ceres/internal/ceres/evaluator.cc with 100% similarity]
extern/ceres/internal/ceres/evaluator.h [moved from extern/libmv/third_party/ceres/internal/ceres/evaluator.h with 100% similarity]
extern/ceres/internal/ceres/execution_summary.h [moved from extern/libmv/third_party/ceres/internal/ceres/execution_summary.h with 100% similarity]
extern/ceres/internal/ceres/file.cc [moved from extern/libmv/third_party/ceres/internal/ceres/file.cc with 100% similarity]
extern/ceres/internal/ceres/file.h [moved from extern/libmv/third_party/ceres/internal/ceres/file.h with 100% similarity]
extern/ceres/internal/ceres/generate_eliminator_specialization.py [moved from extern/libmv/third_party/ceres/internal/ceres/generate_eliminator_specialization.py with 100% similarity]
extern/ceres/internal/ceres/generate_partitioned_matrix_view_specializations.py [moved from extern/libmv/third_party/ceres/internal/ceres/generate_partitioned_matrix_view_specializations.py with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_2.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_2.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_3.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_3.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_4.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_4.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_d.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_2_d.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_3.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_3.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_4.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_4.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_6.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_6.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_9.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_9.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_d.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_3_d.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_3.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_3.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_4.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_4.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_8.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_8.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_9.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_9.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_d.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_4_d.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_2_d_d.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_2_d_d.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_2.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_2.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_3.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_3.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_4.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_4.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_d.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_4_4_d.cc with 100% similarity]
extern/ceres/internal/ceres/generated/partitioned_matrix_view_d_d_d.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/partitioned_matrix_view_d_d_d.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_2.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_3.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_4.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_2_d.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_3.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_4.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_2_3_6.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_6.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_9.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_3_d.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_3.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_4.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_2_4_8.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_8.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_2_4_9.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_9.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_4_d.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_2_d_d.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_2_d_d.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_2.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_3.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_4.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_4_4_d.cc with 100% similarity]
extern/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc [moved from extern/libmv/third_party/ceres/internal/ceres/generated/schur_eliminator_d_d_d.cc with 100% similarity]
extern/ceres/internal/ceres/gradient_checking_cost_function.cc [moved from extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.cc with 100% similarity]
extern/ceres/internal/ceres/gradient_checking_cost_function.h [moved from extern/libmv/third_party/ceres/internal/ceres/gradient_checking_cost_function.h with 100% similarity]
extern/ceres/internal/ceres/gradient_problem.cc [moved from extern/libmv/third_party/ceres/internal/ceres/gradient_problem.cc with 100% similarity]
extern/ceres/internal/ceres/gradient_problem_evaluator.h [moved from extern/libmv/third_party/ceres/internal/ceres/gradient_problem_evaluator.h with 100% similarity]
extern/ceres/internal/ceres/gradient_problem_solver.cc [moved from extern/libmv/third_party/ceres/internal/ceres/gradient_problem_solver.cc with 100% similarity]
extern/ceres/internal/ceres/graph.h [moved from extern/libmv/third_party/ceres/internal/ceres/graph.h with 100% similarity]
extern/ceres/internal/ceres/graph_algorithms.h [moved from extern/libmv/third_party/ceres/internal/ceres/graph_algorithms.h with 100% similarity]
extern/ceres/internal/ceres/householder_vector.h [moved from extern/libmv/third_party/ceres/internal/ceres/householder_vector.h with 100% similarity]
extern/ceres/internal/ceres/implicit_schur_complement.cc [moved from extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.cc with 100% similarity]
extern/ceres/internal/ceres/implicit_schur_complement.h [moved from extern/libmv/third_party/ceres/internal/ceres/implicit_schur_complement.h with 100% similarity]
extern/ceres/internal/ceres/integral_types.h [moved from extern/libmv/third_party/ceres/internal/ceres/integral_types.h with 100% similarity]
extern/ceres/internal/ceres/iterative_schur_complement_solver.cc [moved from extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.cc with 100% similarity]
extern/ceres/internal/ceres/iterative_schur_complement_solver.h [moved from extern/libmv/third_party/ceres/internal/ceres/iterative_schur_complement_solver.h with 100% similarity]
extern/ceres/internal/ceres/lapack.cc [moved from extern/libmv/third_party/ceres/internal/ceres/lapack.cc with 100% similarity]
extern/ceres/internal/ceres/lapack.h [moved from extern/libmv/third_party/ceres/internal/ceres/lapack.h with 100% similarity]
extern/ceres/internal/ceres/levenberg_marquardt_strategy.cc [moved from extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt_strategy.cc with 100% similarity]
extern/ceres/internal/ceres/levenberg_marquardt_strategy.h [moved from extern/libmv/third_party/ceres/internal/ceres/levenberg_marquardt_strategy.h with 100% similarity]
extern/ceres/internal/ceres/line_search.cc [moved from extern/libmv/third_party/ceres/internal/ceres/line_search.cc with 100% similarity]
extern/ceres/internal/ceres/line_search.h [moved from extern/libmv/third_party/ceres/internal/ceres/line_search.h with 100% similarity]
extern/ceres/internal/ceres/line_search_direction.cc [moved from extern/libmv/third_party/ceres/internal/ceres/line_search_direction.cc with 100% similarity]
extern/ceres/internal/ceres/line_search_direction.h [moved from extern/libmv/third_party/ceres/internal/ceres/line_search_direction.h with 100% similarity]
extern/ceres/internal/ceres/line_search_minimizer.cc [moved from extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.cc with 100% similarity]
extern/ceres/internal/ceres/line_search_minimizer.h [moved from extern/libmv/third_party/ceres/internal/ceres/line_search_minimizer.h with 100% similarity]
extern/ceres/internal/ceres/line_search_preprocessor.cc [moved from extern/libmv/third_party/ceres/internal/ceres/line_search_preprocessor.cc with 100% similarity]
extern/ceres/internal/ceres/line_search_preprocessor.h [moved from extern/libmv/third_party/ceres/internal/ceres/line_search_preprocessor.h with 100% similarity]
extern/ceres/internal/ceres/linear_least_squares_problems.cc [moved from extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.cc with 100% similarity]
extern/ceres/internal/ceres/linear_least_squares_problems.h [moved from extern/libmv/third_party/ceres/internal/ceres/linear_least_squares_problems.h with 100% similarity]
extern/ceres/internal/ceres/linear_operator.cc [moved from extern/libmv/third_party/ceres/internal/ceres/linear_operator.cc with 100% similarity]
extern/ceres/internal/ceres/linear_operator.h [moved from extern/libmv/third_party/ceres/internal/ceres/linear_operator.h with 100% similarity]
extern/ceres/internal/ceres/linear_solver.cc [moved from extern/libmv/third_party/ceres/internal/ceres/linear_solver.cc with 100% similarity]
extern/ceres/internal/ceres/linear_solver.h [moved from extern/libmv/third_party/ceres/internal/ceres/linear_solver.h with 100% similarity]
extern/ceres/internal/ceres/local_parameterization.cc [moved from extern/libmv/third_party/ceres/internal/ceres/local_parameterization.cc with 100% similarity]
extern/ceres/internal/ceres/loss_function.cc [moved from extern/libmv/third_party/ceres/internal/ceres/loss_function.cc with 100% similarity]
extern/ceres/internal/ceres/low_rank_inverse_hessian.cc [moved from extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.cc with 100% similarity]
extern/ceres/internal/ceres/low_rank_inverse_hessian.h [moved from extern/libmv/third_party/ceres/internal/ceres/low_rank_inverse_hessian.h with 100% similarity]
extern/ceres/internal/ceres/map_util.h [moved from extern/libmv/third_party/ceres/internal/ceres/map_util.h with 100% similarity]
extern/ceres/internal/ceres/minimizer.cc [moved from extern/libmv/third_party/ceres/internal/ceres/minimizer.cc with 100% similarity]
extern/ceres/internal/ceres/minimizer.h [moved from extern/libmv/third_party/ceres/internal/ceres/minimizer.h with 100% similarity]
extern/ceres/internal/ceres/mutex.h [moved from extern/libmv/third_party/ceres/internal/ceres/mutex.h with 100% similarity]
extern/ceres/internal/ceres/normal_prior.cc [moved from extern/libmv/third_party/ceres/internal/ceres/normal_prior.cc with 100% similarity]
extern/ceres/internal/ceres/parameter_block.h [moved from extern/libmv/third_party/ceres/internal/ceres/parameter_block.h with 100% similarity]
extern/ceres/internal/ceres/parameter_block_ordering.cc [moved from extern/libmv/third_party/ceres/internal/ceres/parameter_block_ordering.cc with 100% similarity]
extern/ceres/internal/ceres/parameter_block_ordering.h [moved from extern/libmv/third_party/ceres/internal/ceres/parameter_block_ordering.h with 100% similarity]
extern/ceres/internal/ceres/partitioned_matrix_view.cc [moved from extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.cc with 100% similarity]
extern/ceres/internal/ceres/partitioned_matrix_view.h [moved from extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view.h with 100% similarity]
extern/ceres/internal/ceres/partitioned_matrix_view_impl.h [moved from extern/libmv/third_party/ceres/internal/ceres/partitioned_matrix_view_impl.h with 100% similarity]
extern/ceres/internal/ceres/polynomial.cc [moved from extern/libmv/third_party/ceres/internal/ceres/polynomial.cc with 100% similarity]
extern/ceres/internal/ceres/polynomial.h [moved from extern/libmv/third_party/ceres/internal/ceres/polynomial.h with 100% similarity]
extern/ceres/internal/ceres/preconditioner.cc [moved from extern/libmv/third_party/ceres/internal/ceres/preconditioner.cc with 100% similarity]
extern/ceres/internal/ceres/preconditioner.h [moved from extern/libmv/third_party/ceres/internal/ceres/preconditioner.h with 100% similarity]
extern/ceres/internal/ceres/preprocessor.cc [moved from extern/libmv/third_party/ceres/internal/ceres/preprocessor.cc with 100% similarity]
extern/ceres/internal/ceres/preprocessor.h [moved from extern/libmv/third_party/ceres/internal/ceres/preprocessor.h with 100% similarity]
extern/ceres/internal/ceres/problem.cc [moved from extern/libmv/third_party/ceres/internal/ceres/problem.cc with 100% similarity]
extern/ceres/internal/ceres/problem_impl.cc [moved from extern/libmv/third_party/ceres/internal/ceres/problem_impl.cc with 100% similarity]
extern/ceres/internal/ceres/problem_impl.h [moved from extern/libmv/third_party/ceres/internal/ceres/problem_impl.h with 100% similarity]
extern/ceres/internal/ceres/program.cc [moved from extern/libmv/third_party/ceres/internal/ceres/program.cc with 100% similarity]
extern/ceres/internal/ceres/program.h [moved from extern/libmv/third_party/ceres/internal/ceres/program.h with 100% similarity]
extern/ceres/internal/ceres/program_evaluator.h [moved from extern/libmv/third_party/ceres/internal/ceres/program_evaluator.h with 100% similarity]
extern/ceres/internal/ceres/random.h [moved from extern/libmv/third_party/ceres/internal/ceres/random.h with 100% similarity]
extern/ceres/internal/ceres/reorder_program.cc [moved from extern/libmv/third_party/ceres/internal/ceres/reorder_program.cc with 100% similarity]
extern/ceres/internal/ceres/reorder_program.h [moved from extern/libmv/third_party/ceres/internal/ceres/reorder_program.h with 100% similarity]
extern/ceres/internal/ceres/residual_block.cc [moved from extern/libmv/third_party/ceres/internal/ceres/residual_block.cc with 100% similarity]
extern/ceres/internal/ceres/residual_block.h [moved from extern/libmv/third_party/ceres/internal/ceres/residual_block.h with 100% similarity]
extern/ceres/internal/ceres/residual_block_utils.cc [moved from extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.cc with 100% similarity]
extern/ceres/internal/ceres/residual_block_utils.h [moved from extern/libmv/third_party/ceres/internal/ceres/residual_block_utils.h with 100% similarity]
extern/ceres/internal/ceres/schur_complement_solver.cc [moved from extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.cc with 100% similarity]
extern/ceres/internal/ceres/schur_complement_solver.h [moved from extern/libmv/third_party/ceres/internal/ceres/schur_complement_solver.h with 100% similarity]
extern/ceres/internal/ceres/schur_eliminator.cc [moved from extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.cc with 100% similarity]
extern/ceres/internal/ceres/schur_eliminator.h [moved from extern/libmv/third_party/ceres/internal/ceres/schur_eliminator.h with 100% similarity]
extern/ceres/internal/ceres/schur_eliminator_impl.h [moved from extern/libmv/third_party/ceres/internal/ceres/schur_eliminator_impl.h with 100% similarity]
extern/ceres/internal/ceres/schur_jacobi_preconditioner.cc [moved from extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.cc with 100% similarity]
extern/ceres/internal/ceres/schur_jacobi_preconditioner.h [moved from extern/libmv/third_party/ceres/internal/ceres/schur_jacobi_preconditioner.h with 100% similarity]
extern/ceres/internal/ceres/scratch_evaluate_preparer.cc [moved from extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.cc with 100% similarity]
extern/ceres/internal/ceres/scratch_evaluate_preparer.h [moved from extern/libmv/third_party/ceres/internal/ceres/scratch_evaluate_preparer.h with 100% similarity]
extern/ceres/internal/ceres/small_blas.h [moved from extern/libmv/third_party/ceres/internal/ceres/small_blas.h with 100% similarity]
extern/ceres/internal/ceres/solver.cc [moved from extern/libmv/third_party/ceres/internal/ceres/solver.cc with 100% similarity]
extern/ceres/internal/ceres/solver_utils.cc [moved from extern/libmv/third_party/ceres/internal/ceres/solver_utils.cc with 100% similarity]
extern/ceres/internal/ceres/solver_utils.h [moved from extern/libmv/third_party/ceres/internal/ceres/solver_utils.h with 100% similarity]
extern/ceres/internal/ceres/sparse_matrix.cc [moved from extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.cc with 100% similarity]
extern/ceres/internal/ceres/sparse_matrix.h [moved from extern/libmv/third_party/ceres/internal/ceres/sparse_matrix.h with 100% similarity]
extern/ceres/internal/ceres/sparse_normal_cholesky_solver.cc [moved from extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.cc with 100% similarity]
extern/ceres/internal/ceres/sparse_normal_cholesky_solver.h [moved from extern/libmv/third_party/ceres/internal/ceres/sparse_normal_cholesky_solver.h with 100% similarity]
extern/ceres/internal/ceres/split.cc [moved from extern/libmv/third_party/ceres/internal/ceres/split.cc with 100% similarity]
extern/ceres/internal/ceres/split.h [moved from extern/libmv/third_party/ceres/internal/ceres/split.h with 100% similarity]
extern/ceres/internal/ceres/stl_util.h [moved from extern/libmv/third_party/ceres/internal/ceres/stl_util.h with 100% similarity]
extern/ceres/internal/ceres/stringprintf.cc [moved from extern/libmv/third_party/ceres/internal/ceres/stringprintf.cc with 100% similarity]
extern/ceres/internal/ceres/stringprintf.h [moved from extern/libmv/third_party/ceres/internal/ceres/stringprintf.h with 100% similarity]
extern/ceres/internal/ceres/suitesparse.h [moved from extern/libmv/third_party/ceres/internal/ceres/suitesparse.h with 100% similarity]
extern/ceres/internal/ceres/triplet_sparse_matrix.cc [moved from extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.cc with 100% similarity]
extern/ceres/internal/ceres/triplet_sparse_matrix.h [moved from extern/libmv/third_party/ceres/internal/ceres/triplet_sparse_matrix.h with 100% similarity]
extern/ceres/internal/ceres/trust_region_minimizer.cc [moved from extern/libmv/third_party/ceres/internal/ceres/trust_region_minimizer.cc with 100% similarity]
extern/ceres/internal/ceres/trust_region_minimizer.h [moved from extern/libmv/third_party/ceres/internal/ceres/trust_region_minimizer.h with 100% similarity]
extern/ceres/internal/ceres/trust_region_preprocessor.cc [moved from extern/libmv/third_party/ceres/internal/ceres/trust_region_preprocessor.cc with 100% similarity]
extern/ceres/internal/ceres/trust_region_preprocessor.h [moved from extern/libmv/third_party/ceres/internal/ceres/trust_region_preprocessor.h with 100% similarity]
extern/ceres/internal/ceres/trust_region_strategy.cc [moved from extern/libmv/third_party/ceres/internal/ceres/trust_region_strategy.cc with 100% similarity]
extern/ceres/internal/ceres/trust_region_strategy.h [moved from extern/libmv/third_party/ceres/internal/ceres/trust_region_strategy.h with 100% similarity]
extern/ceres/internal/ceres/types.cc [moved from extern/libmv/third_party/ceres/internal/ceres/types.cc with 100% similarity]
extern/ceres/internal/ceres/visibility_based_preconditioner.h [moved from extern/libmv/third_party/ceres/internal/ceres/visibility_based_preconditioner.h with 100% similarity]
extern/ceres/internal/ceres/wall_time.cc [moved from extern/libmv/third_party/ceres/internal/ceres/wall_time.cc with 100% similarity]
extern/ceres/internal/ceres/wall_time.h [moved from extern/libmv/third_party/ceres/internal/ceres/wall_time.h with 100% similarity]
extern/ceres/mkfiles.sh [moved from extern/libmv/third_party/ceres/mkfiles.sh with 100% similarity]
extern/ceres/patches/series [moved from extern/libmv/third_party/ceres/patches/series with 100% similarity]
extern/libmv/CMakeLists.txt
extern/libmv/bundle.sh
extern/libmv/third_party/CMakeLists.txt [deleted file]

index b04a771..a4206c3 100644 (file)
@@ -2600,6 +2600,46 @@ if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
        )
 endif()
 
+#-----------------------------------------------------------------------------
+# Configure Ceres
+
+if(WITH_LIBMV)
+       set(CERES_DEFINES)
+
+       TEST_SHARED_PTR_SUPPORT()
+       if(SHARED_PTR_FOUND)
+               if(SHARED_PTR_TR1_MEMORY_HEADER)
+                       list(APPEND CERES_DEFINES -DCERES_TR1_MEMORY_HEADER)
+               endif()
+               if(SHARED_PTR_TR1_NAMESPACE)
+                       list(APPEND CERES_DEFINES -DCERES_TR1_SHARED_PTR)
+               endif()
+       else()
+               message(FATAL_ERROR "Ceres: Unable to find shared_ptr.")
+       endif()
+
+       TEST_UNORDERED_MAP_SUPPORT()
+       if(HAVE_STD_UNORDERED_MAP_HEADER)
+               if(HAVE_UNORDERED_MAP_IN_STD_NAMESPACE)
+                       list(APPEND CERES_DEFINES -DCERES_STD_UNORDERED_MAP)
+               else()
+                       if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
+                               list(APPEND CERES_DEFINES -DCERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)
+                       else()
+                               list(APPEND CERES_DEFINES -DCERES_NO_UNORDERED_MAP)
+                               message(STATUS "Ceres: Replacing unordered_map/set with map/set (warning: slower!)")
+                       endif()
+               endif()
+       else()
+               if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
+                       list(APPEND CERES_DEFINES -DCERES_TR1_UNORDERED_MAP)
+               else()
+                       list(APPEND CERES_DEFINES -DCERES_NO_UNORDERED_MAP)
+                       message(STATUS "Ceres: Replacing unordered_map/set with map/set (warning: slower!)")
+               endif()
+       endif()
+endif()
+
 #-----------------------------------------------------------------------------
 # Extra compile flags
 
index 3723a42..3c8e815 100644 (file)
@@ -86,6 +86,10 @@ if(WITH_X11 AND WITH_GHOST_XDND)
        add_subdirectory(xdnd)
 endif()
 
+if(WITH_LIBMV)
+       add_subdirectory(ceres)
+endif()
+
 if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
        add_subdirectory(gflags)
        add_subdirectory(glog)
similarity index 97%
rename from extern/libmv/third_party/ceres/CMakeLists.txt
rename to extern/ceres/CMakeLists.txt
index 024fcde..711b2ef 100644 (file)
@@ -31,8 +31,7 @@ set(INC
        include
        internal
        config
-       ../../../gflags/src
-       ../../
+       ../gflags/src
 )
 
 set(INC_SYS
@@ -131,6 +130,7 @@ set(SRC
        include/ceres/covariance.h
        include/ceres/crs_matrix.h
        include/ceres/dynamic_autodiff_cost_function.h
+       include/ceres/dynamic_cost_function_to_functor.h
        include/ceres/dynamic_numeric_diff_cost_function.h
        include/ceres/fpclassify.h
        include/ceres/gradient_checker.h
@@ -153,6 +153,7 @@ set(SRC
        include/ceres/loss_function.h
        include/ceres/normal_prior.h
        include/ceres/numeric_diff_cost_function.h
+       include/ceres/numeric_diff_options.h
        include/ceres/ordered_groups.h
        include/ceres/problem.h
        include/ceres/rotation.h
@@ -200,6 +201,7 @@ set(SRC
        internal/ceres/gradient_problem_evaluator.h
        internal/ceres/graph_algorithms.h
        internal/ceres/graph.h
+       internal/ceres/householder_vector.h
        internal/ceres/implicit_schur_complement.h
        internal/ceres/integral_types.h
        internal/ceres/iterative_schur_complement_solver.h
@@ -298,20 +300,18 @@ endif()
 
 if(WIN32)
        list(APPEND INC
-               ../../../glog/src/windows
+               ../glog/src/windows
        )
-
-       if(NOT MINGW)
-               list(APPEND INC
-                       ../msinttypes
-               )
-       endif()
 else()
        list(APPEND INC
-               ../../../glog/src
+               ../glog/src
        )
 endif()
 
+add_definitions(${GFLAGS_DEFINES})
+add_definitions(${GLOG_DEFINES})
+add_definitions(${CERES_DEFINES})
+
 add_definitions(
        -DCERES_HAVE_PTHREAD
        -DCERES_NO_SUITESPARSE
similarity index 97%
rename from extern/libmv/third_party/ceres/bundle.sh
rename to extern/ceres/bundle.sh
index 85da4f2..0eaf00f 100755 (executable)
@@ -124,8 +124,7 @@ set(INC
        include
        internal
        config
-       ../gflags
-       ../../
+       ../gflags/src
 )
 
 set(INC_SYS
@@ -150,18 +149,16 @@ if(WIN32)
        list(APPEND INC
                ../glog/src/windows
        )
-
-       if(NOT MINGW)
-               list(APPEND INC
-                       ../msinttypes
-               )
-       endif()
 else()
        list(APPEND INC
                ../glog/src
        )
 endif()
 
+add_definitions(\${GFLAGS_DEFINES})
+add_definitions(\${GLOG_DEFINES})
+add_definitions(\${CERES_DEFINES})
+
 add_definitions(
        -DCERES_HAVE_PTHREAD
        -DCERES_NO_SUITESPARSE
index c4d27c2..375031f 100644 (file)
@@ -37,22 +37,9 @@ set(SRC
        libmv-capi.h
 )
 
-TEST_SHARED_PTR_SUPPORT()
-if(SHARED_PTR_FOUND)
-       if(SHARED_PTR_TR1_MEMORY_HEADER)
-               add_definitions(-DCERES_TR1_MEMORY_HEADER)
-       endif()
-       if(SHARED_PTR_TR1_NAMESPACE)
-               add_definitions(-DCERES_TR1_SHARED_PTR)
-       endif()
-else()
-       message(FATAL_ERROR "Unable to find shared_ptr.")
-endif()
-
 add_definitions(${GFLAGS_DEFINES})
 add_definitions(${GLOG_DEFINES})
-
-add_subdirectory(third_party)
+add_definitions(${CERES_DEFINES})
 
 if(WITH_LIBMV)
        list(APPEND INC
index da465e5..273365b 100755 (executable)
@@ -17,10 +17,7 @@ git clone -b $BRANCH $repo $tmp/libmv
 git --git-dir $tmp/libmv/.git --work-tree $tmp/libmv log -n 50 > ChangeLog
 
 find libmv -type f -exec rm -rf {} \;
-find third_party -type f \
-    -not -iwholename '*third_party/ceres*' \
-    -not -iwholename '*third_party/CMakeLists.txt*' \
-    -exec rm -rf {} \;
+find third_party -type f -exec rm -rf {} \;
 
 cat "files.txt" | while read f; do
   mkdir -p `dirname $f`
@@ -32,13 +29,13 @@ rm -rf $tmp
 sources=`find ./libmv -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep -v _test.cc | grep -v test_data_sets | sed -r 's/^\.\//\t\t/' | sort -d`
 headers=`find ./libmv -type f -iname '*.h' | grep -v test_data_sets | sed -r 's/^\.\//\t\t/' | sort -d`
 
-third_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep -v ceres | sed -r 's/^\.\//\t\t/' | sort -d`
-third_headers=`find ./third_party -type f -iname '*.h' | grep -v ceres | sed -r 's/^\.\//\t\t/' | sort -d`
+third_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//\t\t/' | sort -d`
+third_headers=`find ./third_party -type f -iname '*.h' | 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("\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`
+src_third_dir=`find ./third_party -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=""
 win_src=""
 for x in $src_dir $src_third_dir; do
@@ -119,28 +116,13 @@ set(SRC
        libmv-capi.h
 )
 
-TEST_SHARED_PTR_SUPPORT()
-if(SHARED_PTR_FOUND)
-       if(SHARED_PTR_TR1_MEMORY_HEADER)
-               add_definitions(-DCERES_TR1_MEMORY_HEADER)
-       endif()
-       if(SHARED_PTR_TR1_NAMESPACE)
-               add_definitions(-DCERES_TR1_SHARED_PTR)
-       endif()
-else()
-       message(FATAL_ERROR "Unable to find shared_ptr.")
-endif()
-
-add_definitions(-DGOOGLE_GLOG_DLL_DECL=)
-add_definitions(-DGFLAGS_DLL_DEFINE_FLAG=)
-add_definitions(-DGFLAGS_DLL_DECLARE_FLAG=)
-add_definitions(-DGFLAGS_DLL_DECL=)
-
-add_subdirectory(third_party)
+add_definitions(\${GFLAGS_DEFINES})
+add_definitions(\${GLOG_DEFINES})
+add_definitions(\${CERES_DEFINES})
 
 if(WITH_LIBMV)
        list(APPEND INC
-               ../gflags
+               ../gflags/src
                ../glog/src
                third_party/ceres/include
                third_party/ceres/config
diff --git a/extern/libmv/third_party/CMakeLists.txt b/extern/libmv/third_party/CMakeLists.txt
deleted file mode 100644 (file)
index e54d5fb..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2016, Blender Foundation
-# All rights reserved.
-#
-# Contributor(s): Sergey Sharybin.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-if(WITH_LIBMV)
-       add_subdirectory(ceres)
-endif()