Move Libmv from extern/ to intern/
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 4 Jan 2016 13:22:27 +0000 (18:22 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 4 Jan 2016 14:39:13 +0000 (19:39 +0500)
Logically it is intern library since being mainly developed by 1.5 blender guys.

175 files changed:
build_files/cmake/macros.cmake
extern/CMakeLists.txt
intern/CMakeLists.txt
intern/libmv/CMakeLists.txt [moved from extern/libmv/CMakeLists.txt with 97% similarity]
intern/libmv/ChangeLog [moved from extern/libmv/ChangeLog with 100% similarity]
intern/libmv/bundle.sh [moved from extern/libmv/bundle.sh with 93% similarity]
intern/libmv/files.txt [moved from extern/libmv/files.txt with 100% similarity]
intern/libmv/intern/autotrack.cc [moved from extern/libmv/intern/autotrack.cc with 100% similarity]
intern/libmv/intern/autotrack.h [moved from extern/libmv/intern/autotrack.h with 100% similarity]
intern/libmv/intern/camera_intrinsics.cc [moved from extern/libmv/intern/camera_intrinsics.cc with 100% similarity]
intern/libmv/intern/camera_intrinsics.h [moved from extern/libmv/intern/camera_intrinsics.h with 100% similarity]
intern/libmv/intern/detector.cc [moved from extern/libmv/intern/detector.cc with 100% similarity]
intern/libmv/intern/detector.h [moved from extern/libmv/intern/detector.h with 100% similarity]
intern/libmv/intern/frame_accessor.cc [moved from extern/libmv/intern/frame_accessor.cc with 100% similarity]
intern/libmv/intern/frame_accessor.h [moved from extern/libmv/intern/frame_accessor.h with 100% similarity]
intern/libmv/intern/homography.cc [moved from extern/libmv/intern/homography.cc with 100% similarity]
intern/libmv/intern/homography.h [moved from extern/libmv/intern/homography.h with 100% similarity]
intern/libmv/intern/image.cc [moved from extern/libmv/intern/image.cc with 100% similarity]
intern/libmv/intern/image.h [moved from extern/libmv/intern/image.h with 100% similarity]
intern/libmv/intern/logging.cc [moved from extern/libmv/intern/logging.cc with 100% similarity]
intern/libmv/intern/logging.h [moved from extern/libmv/intern/logging.h with 100% similarity]
intern/libmv/intern/reconstruction.cc [moved from extern/libmv/intern/reconstruction.cc with 100% similarity]
intern/libmv/intern/reconstruction.h [moved from extern/libmv/intern/reconstruction.h with 100% similarity]
intern/libmv/intern/region.h [moved from extern/libmv/intern/region.h with 100% similarity]
intern/libmv/intern/stub.cc [moved from extern/libmv/intern/stub.cc with 100% similarity]
intern/libmv/intern/track_region.cc [moved from extern/libmv/intern/track_region.cc with 100% similarity]
intern/libmv/intern/track_region.h [moved from extern/libmv/intern/track_region.h with 100% similarity]
intern/libmv/intern/tracks.cc [moved from extern/libmv/intern/tracks.cc with 100% similarity]
intern/libmv/intern/tracks.h [moved from extern/libmv/intern/tracks.h with 100% similarity]
intern/libmv/intern/tracksN.cc [moved from extern/libmv/intern/tracksN.cc with 100% similarity]
intern/libmv/intern/tracksN.h [moved from extern/libmv/intern/tracksN.h with 100% similarity]
intern/libmv/intern/utildefines.h [moved from extern/libmv/intern/utildefines.h with 100% similarity]
intern/libmv/libmv-capi.h [moved from extern/libmv/libmv-capi.h with 100% similarity]
intern/libmv/libmv/autotrack/autotrack.cc [moved from extern/libmv/libmv/autotrack/autotrack.cc with 100% similarity]
intern/libmv/libmv/autotrack/autotrack.h [moved from extern/libmv/libmv/autotrack/autotrack.h with 100% similarity]
intern/libmv/libmv/autotrack/callbacks.h [moved from extern/libmv/libmv/autotrack/callbacks.h with 100% similarity]
intern/libmv/libmv/autotrack/frame_accessor.h [moved from extern/libmv/libmv/autotrack/frame_accessor.h with 100% similarity]
intern/libmv/libmv/autotrack/marker.h [moved from extern/libmv/libmv/autotrack/marker.h with 100% similarity]
intern/libmv/libmv/autotrack/model.h [moved from extern/libmv/libmv/autotrack/model.h with 100% similarity]
intern/libmv/libmv/autotrack/predict_tracks.cc [moved from extern/libmv/libmv/autotrack/predict_tracks.cc with 100% similarity]
intern/libmv/libmv/autotrack/predict_tracks.h [moved from extern/libmv/libmv/autotrack/predict_tracks.h with 100% similarity]
intern/libmv/libmv/autotrack/predict_tracks_test.cc [moved from extern/libmv/libmv/autotrack/predict_tracks_test.cc with 100% similarity]
intern/libmv/libmv/autotrack/quad.h [moved from extern/libmv/libmv/autotrack/quad.h with 100% similarity]
intern/libmv/libmv/autotrack/reconstruction.h [moved from extern/libmv/libmv/autotrack/reconstruction.h with 100% similarity]
intern/libmv/libmv/autotrack/region.h [moved from extern/libmv/libmv/autotrack/region.h with 100% similarity]
intern/libmv/libmv/autotrack/tracks.cc [moved from extern/libmv/libmv/autotrack/tracks.cc with 100% similarity]
intern/libmv/libmv/autotrack/tracks.h [moved from extern/libmv/libmv/autotrack/tracks.h with 100% similarity]
intern/libmv/libmv/autotrack/tracks_test.cc [moved from extern/libmv/libmv/autotrack/tracks_test.cc with 100% similarity]
intern/libmv/libmv/base/aligned_malloc.cc [moved from extern/libmv/libmv/base/aligned_malloc.cc with 100% similarity]
intern/libmv/libmv/base/aligned_malloc.h [moved from extern/libmv/libmv/base/aligned_malloc.h with 100% similarity]
intern/libmv/libmv/base/id_generator.h [moved from extern/libmv/libmv/base/id_generator.h with 100% similarity]
intern/libmv/libmv/base/scoped_ptr.h [moved from extern/libmv/libmv/base/scoped_ptr.h with 100% similarity]
intern/libmv/libmv/base/scoped_ptr_test.cc [moved from extern/libmv/libmv/base/scoped_ptr_test.cc with 100% similarity]
intern/libmv/libmv/base/vector.h [moved from extern/libmv/libmv/base/vector.h with 100% similarity]
intern/libmv/libmv/base/vector_test.cc [moved from extern/libmv/libmv/base/vector_test.cc with 100% similarity]
intern/libmv/libmv/base/vector_utils.h [moved from extern/libmv/libmv/base/vector_utils.h with 100% similarity]
intern/libmv/libmv/image/array_nd.cc [moved from extern/libmv/libmv/image/array_nd.cc with 100% similarity]
intern/libmv/libmv/image/array_nd.h [moved from extern/libmv/libmv/image/array_nd.h with 100% similarity]
intern/libmv/libmv/image/array_nd_test.cc [moved from extern/libmv/libmv/image/array_nd_test.cc with 100% similarity]
intern/libmv/libmv/image/convolve.cc [moved from extern/libmv/libmv/image/convolve.cc with 100% similarity]
intern/libmv/libmv/image/convolve.h [moved from extern/libmv/libmv/image/convolve.h with 100% similarity]
intern/libmv/libmv/image/convolve_test.cc [moved from extern/libmv/libmv/image/convolve_test.cc with 100% similarity]
intern/libmv/libmv/image/correlation.h [moved from extern/libmv/libmv/image/correlation.h with 100% similarity]
intern/libmv/libmv/image/image.h [moved from extern/libmv/libmv/image/image.h with 100% similarity]
intern/libmv/libmv/image/image_converter.h [moved from extern/libmv/libmv/image/image_converter.h with 100% similarity]
intern/libmv/libmv/image/image_drawing.h [moved from extern/libmv/libmv/image/image_drawing.h with 100% similarity]
intern/libmv/libmv/image/image_test.cc [moved from extern/libmv/libmv/image/image_test.cc with 100% similarity]
intern/libmv/libmv/image/sample.h [moved from extern/libmv/libmv/image/sample.h with 100% similarity]
intern/libmv/libmv/image/sample_test.cc [moved from extern/libmv/libmv/image/sample_test.cc with 100% similarity]
intern/libmv/libmv/image/tuple.h [moved from extern/libmv/libmv/image/tuple.h with 100% similarity]
intern/libmv/libmv/image/tuple_test.cc [moved from extern/libmv/libmv/image/tuple_test.cc with 100% similarity]
intern/libmv/libmv/logging/logging.h [moved from extern/libmv/libmv/logging/logging.h with 100% similarity]
intern/libmv/libmv/multiview/conditioning.cc [moved from extern/libmv/libmv/multiview/conditioning.cc with 100% similarity]
intern/libmv/libmv/multiview/conditioning.h [moved from extern/libmv/libmv/multiview/conditioning.h with 100% similarity]
intern/libmv/libmv/multiview/euclidean_resection.cc [moved from extern/libmv/libmv/multiview/euclidean_resection.cc with 100% similarity]
intern/libmv/libmv/multiview/euclidean_resection.h [moved from extern/libmv/libmv/multiview/euclidean_resection.h with 100% similarity]
intern/libmv/libmv/multiview/euclidean_resection_test.cc [moved from extern/libmv/libmv/multiview/euclidean_resection_test.cc with 100% similarity]
intern/libmv/libmv/multiview/fundamental.cc [moved from extern/libmv/libmv/multiview/fundamental.cc with 100% similarity]
intern/libmv/libmv/multiview/fundamental.h [moved from extern/libmv/libmv/multiview/fundamental.h with 100% similarity]
intern/libmv/libmv/multiview/fundamental_test.cc [moved from extern/libmv/libmv/multiview/fundamental_test.cc with 100% similarity]
intern/libmv/libmv/multiview/homography.cc [moved from extern/libmv/libmv/multiview/homography.cc with 100% similarity]
intern/libmv/libmv/multiview/homography.h [moved from extern/libmv/libmv/multiview/homography.h with 100% similarity]
intern/libmv/libmv/multiview/homography_error.h [moved from extern/libmv/libmv/multiview/homography_error.h with 100% similarity]
intern/libmv/libmv/multiview/homography_parameterization.h [moved from extern/libmv/libmv/multiview/homography_parameterization.h with 100% similarity]
intern/libmv/libmv/multiview/homography_test.cc [moved from extern/libmv/libmv/multiview/homography_test.cc with 100% similarity]
intern/libmv/libmv/multiview/nviewtriangulation.h [moved from extern/libmv/libmv/multiview/nviewtriangulation.h with 100% similarity]
intern/libmv/libmv/multiview/nviewtriangulation_test.cc [moved from extern/libmv/libmv/multiview/nviewtriangulation_test.cc with 100% similarity]
intern/libmv/libmv/multiview/panography.cc [moved from extern/libmv/libmv/multiview/panography.cc with 100% similarity]
intern/libmv/libmv/multiview/panography.h [moved from extern/libmv/libmv/multiview/panography.h with 100% similarity]
intern/libmv/libmv/multiview/panography_kernel.cc [moved from extern/libmv/libmv/multiview/panography_kernel.cc with 100% similarity]
intern/libmv/libmv/multiview/panography_kernel.h [moved from extern/libmv/libmv/multiview/panography_kernel.h with 100% similarity]
intern/libmv/libmv/multiview/panography_test.cc [moved from extern/libmv/libmv/multiview/panography_test.cc with 100% similarity]
intern/libmv/libmv/multiview/projection.cc [moved from extern/libmv/libmv/multiview/projection.cc with 100% similarity]
intern/libmv/libmv/multiview/projection.h [moved from extern/libmv/libmv/multiview/projection.h with 100% similarity]
intern/libmv/libmv/multiview/projection_test.cc [moved from extern/libmv/libmv/multiview/projection_test.cc with 100% similarity]
intern/libmv/libmv/multiview/resection.h [moved from extern/libmv/libmv/multiview/resection.h with 100% similarity]
intern/libmv/libmv/multiview/resection_test.cc [moved from extern/libmv/libmv/multiview/resection_test.cc with 100% similarity]
intern/libmv/libmv/multiview/test_data_sets.cc [moved from extern/libmv/libmv/multiview/test_data_sets.cc with 100% similarity]
intern/libmv/libmv/multiview/test_data_sets.h [moved from extern/libmv/libmv/multiview/test_data_sets.h with 100% similarity]
intern/libmv/libmv/multiview/triangulation.cc [moved from extern/libmv/libmv/multiview/triangulation.cc with 100% similarity]
intern/libmv/libmv/multiview/triangulation.h [moved from extern/libmv/libmv/multiview/triangulation.h with 100% similarity]
intern/libmv/libmv/multiview/triangulation_test.cc [moved from extern/libmv/libmv/multiview/triangulation_test.cc with 100% similarity]
intern/libmv/libmv/multiview/two_view_kernel.h [moved from extern/libmv/libmv/multiview/two_view_kernel.h with 100% similarity]
intern/libmv/libmv/numeric/dogleg.h [moved from extern/libmv/libmv/numeric/dogleg.h with 100% similarity]
intern/libmv/libmv/numeric/dogleg_test.cc [moved from extern/libmv/libmv/numeric/dogleg_test.cc with 100% similarity]
intern/libmv/libmv/numeric/function_derivative.h [moved from extern/libmv/libmv/numeric/function_derivative.h with 100% similarity]
intern/libmv/libmv/numeric/function_derivative_test.cc [moved from extern/libmv/libmv/numeric/function_derivative_test.cc with 100% similarity]
intern/libmv/libmv/numeric/levenberg_marquardt.h [moved from extern/libmv/libmv/numeric/levenberg_marquardt.h with 100% similarity]
intern/libmv/libmv/numeric/levenberg_marquardt_test.cc [moved from extern/libmv/libmv/numeric/levenberg_marquardt_test.cc with 100% similarity]
intern/libmv/libmv/numeric/numeric.cc [moved from extern/libmv/libmv/numeric/numeric.cc with 100% similarity]
intern/libmv/libmv/numeric/numeric.h [moved from extern/libmv/libmv/numeric/numeric.h with 100% similarity]
intern/libmv/libmv/numeric/numeric_test.cc [moved from extern/libmv/libmv/numeric/numeric_test.cc with 100% similarity]
intern/libmv/libmv/numeric/poly.cc [moved from extern/libmv/libmv/numeric/poly.cc with 100% similarity]
intern/libmv/libmv/numeric/poly.h [moved from extern/libmv/libmv/numeric/poly.h with 100% similarity]
intern/libmv/libmv/numeric/poly_test.cc [moved from extern/libmv/libmv/numeric/poly_test.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/bundle.cc [moved from extern/libmv/libmv/simple_pipeline/bundle.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/bundle.h [moved from extern/libmv/libmv/simple_pipeline/bundle.h with 100% similarity]
intern/libmv/libmv/simple_pipeline/callbacks.h [moved from extern/libmv/libmv/simple_pipeline/callbacks.h with 100% similarity]
intern/libmv/libmv/simple_pipeline/camera_intrinsics.cc [moved from extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/camera_intrinsics.h [moved from extern/libmv/libmv/simple_pipeline/camera_intrinsics.h with 100% similarity]
intern/libmv/libmv/simple_pipeline/camera_intrinsics_impl.h [moved from extern/libmv/libmv/simple_pipeline/camera_intrinsics_impl.h with 100% similarity]
intern/libmv/libmv/simple_pipeline/camera_intrinsics_test.cc [moved from extern/libmv/libmv/simple_pipeline/camera_intrinsics_test.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/detect.cc [moved from extern/libmv/libmv/simple_pipeline/detect.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/detect.h [moved from extern/libmv/libmv/simple_pipeline/detect.h with 100% similarity]
intern/libmv/libmv/simple_pipeline/detect_test.cc [moved from extern/libmv/libmv/simple_pipeline/detect_test.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/distortion_models.cc [moved from extern/libmv/libmv/simple_pipeline/distortion_models.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/distortion_models.h [moved from extern/libmv/libmv/simple_pipeline/distortion_models.h with 100% similarity]
intern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc [moved from extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/initialize_reconstruction.h [moved from extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h with 100% similarity]
intern/libmv/libmv/simple_pipeline/intersect.cc [moved from extern/libmv/libmv/simple_pipeline/intersect.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/intersect.h [moved from extern/libmv/libmv/simple_pipeline/intersect.h with 100% similarity]
intern/libmv/libmv/simple_pipeline/intersect_test.cc [moved from extern/libmv/libmv/simple_pipeline/intersect_test.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/keyframe_selection.cc [moved from extern/libmv/libmv/simple_pipeline/keyframe_selection.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/keyframe_selection.h [moved from extern/libmv/libmv/simple_pipeline/keyframe_selection.h with 100% similarity]
intern/libmv/libmv/simple_pipeline/keyframe_selection_test.cc [moved from extern/libmv/libmv/simple_pipeline/keyframe_selection_test.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/modal_solver.cc [moved from extern/libmv/libmv/simple_pipeline/modal_solver.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/modal_solver.h [moved from extern/libmv/libmv/simple_pipeline/modal_solver.h with 100% similarity]
intern/libmv/libmv/simple_pipeline/modal_solver_test.cc [moved from extern/libmv/libmv/simple_pipeline/modal_solver_test.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/pipeline.cc [moved from extern/libmv/libmv/simple_pipeline/pipeline.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/pipeline.h [moved from extern/libmv/libmv/simple_pipeline/pipeline.h with 100% similarity]
intern/libmv/libmv/simple_pipeline/reconstruction.cc [moved from extern/libmv/libmv/simple_pipeline/reconstruction.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/reconstruction.h [moved from extern/libmv/libmv/simple_pipeline/reconstruction.h with 100% similarity]
intern/libmv/libmv/simple_pipeline/reconstruction_scale.cc [moved from extern/libmv/libmv/simple_pipeline/reconstruction_scale.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/reconstruction_scale.h [moved from extern/libmv/libmv/simple_pipeline/reconstruction_scale.h with 100% similarity]
intern/libmv/libmv/simple_pipeline/resect.cc [moved from extern/libmv/libmv/simple_pipeline/resect.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/resect.h [moved from extern/libmv/libmv/simple_pipeline/resect.h with 100% similarity]
intern/libmv/libmv/simple_pipeline/resect_test.cc [moved from extern/libmv/libmv/simple_pipeline/resect_test.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/tracks.cc [moved from extern/libmv/libmv/simple_pipeline/tracks.cc with 100% similarity]
intern/libmv/libmv/simple_pipeline/tracks.h [moved from extern/libmv/libmv/simple_pipeline/tracks.h with 100% similarity]
intern/libmv/libmv/tracking/brute_region_tracker.cc [moved from extern/libmv/libmv/tracking/brute_region_tracker.cc with 100% similarity]
intern/libmv/libmv/tracking/brute_region_tracker.h [moved from extern/libmv/libmv/tracking/brute_region_tracker.h with 100% similarity]
intern/libmv/libmv/tracking/brute_region_tracker_test.cc [moved from extern/libmv/libmv/tracking/brute_region_tracker_test.cc with 100% similarity]
intern/libmv/libmv/tracking/hybrid_region_tracker.cc [moved from extern/libmv/libmv/tracking/hybrid_region_tracker.cc with 100% similarity]
intern/libmv/libmv/tracking/hybrid_region_tracker.h [moved from extern/libmv/libmv/tracking/hybrid_region_tracker.h with 100% similarity]
intern/libmv/libmv/tracking/kalman_filter.h [moved from extern/libmv/libmv/tracking/kalman_filter.h with 100% similarity]
intern/libmv/libmv/tracking/klt_region_tracker.cc [moved from extern/libmv/libmv/tracking/klt_region_tracker.cc with 100% similarity]
intern/libmv/libmv/tracking/klt_region_tracker.h [moved from extern/libmv/libmv/tracking/klt_region_tracker.h with 100% similarity]
intern/libmv/libmv/tracking/klt_region_tracker_test.cc [moved from extern/libmv/libmv/tracking/klt_region_tracker_test.cc with 100% similarity]
intern/libmv/libmv/tracking/pyramid_region_tracker.cc [moved from extern/libmv/libmv/tracking/pyramid_region_tracker.cc with 100% similarity]
intern/libmv/libmv/tracking/pyramid_region_tracker.h [moved from extern/libmv/libmv/tracking/pyramid_region_tracker.h with 100% similarity]
intern/libmv/libmv/tracking/pyramid_region_tracker_test.cc [moved from extern/libmv/libmv/tracking/pyramid_region_tracker_test.cc with 100% similarity]
intern/libmv/libmv/tracking/region_tracker.h [moved from extern/libmv/libmv/tracking/region_tracker.h with 100% similarity]
intern/libmv/libmv/tracking/retrack_region_tracker.cc [moved from extern/libmv/libmv/tracking/retrack_region_tracker.cc with 100% similarity]
intern/libmv/libmv/tracking/retrack_region_tracker.h [moved from extern/libmv/libmv/tracking/retrack_region_tracker.h with 100% similarity]
intern/libmv/libmv/tracking/track_region.cc [moved from extern/libmv/libmv/tracking/track_region.cc with 100% similarity]
intern/libmv/libmv/tracking/track_region.h [moved from extern/libmv/libmv/tracking/track_region.h with 100% similarity]
intern/libmv/libmv/tracking/trklt_region_tracker.cc [moved from extern/libmv/libmv/tracking/trklt_region_tracker.cc with 100% similarity]
intern/libmv/libmv/tracking/trklt_region_tracker.h [moved from extern/libmv/libmv/tracking/trklt_region_tracker.h with 100% similarity]
intern/libmv/mkfiles.sh [moved from extern/libmv/mkfiles.sh with 100% similarity]
intern/libmv/third_party/msinttypes/README.libmv [moved from extern/libmv/third_party/msinttypes/README.libmv with 100% similarity]
intern/libmv/third_party/msinttypes/inttypes.h [moved from extern/libmv/third_party/msinttypes/inttypes.h with 100% similarity]
intern/libmv/third_party/msinttypes/stdint.h [moved from extern/libmv/third_party/msinttypes/stdint.h with 100% similarity]
source/blender/blenkernel/CMakeLists.txt
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt

index e57f93e6dced64402a9d11a33dbf50be24da4159..3672dbf11bccd4b5743eb22b2876b3c94e205a3c 100644 (file)
@@ -628,7 +628,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
                bf_intern_eigen
                extern_rangetree
                extern_wcwidth
-               extern_libmv
+               bf_intern_libmv
                extern_glog
                extern_gflags
                extern_sdlew
index 3c8e8150ba1877793c6b1bfecea250ebc8bff6db..632b68ef0742184b971f144255b7884c459093c8 100644 (file)
@@ -28,7 +28,6 @@ remove_strict_flags()
 
 add_subdirectory(rangetree)
 add_subdirectory(wcwidth)
-add_subdirectory(libmv)
 
 if(WITH_BULLET)
        if(NOT WITH_SYSTEM_BULLET)
index 275524f788fcd7175265db1ee21b6027e7e74d80..71cbf5dbb65a7b74e372f8b503725f0704d8a9fe 100644 (file)
@@ -27,6 +27,7 @@
 add_subdirectory(string)
 add_subdirectory(ghost)
 add_subdirectory(guardedalloc)
+add_subdirectory(libmv)
 add_subdirectory(memutil)
 add_subdirectory(opencolorio)
 add_subdirectory(mikktspace)
similarity index 97%
rename from extern/libmv/CMakeLists.txt
rename to intern/libmv/CMakeLists.txt
index 375031fd1cb2961b36335469cdad136a03f9f305..65f8af5694e4aec17940ce3aad33626f4e521514 100644 (file)
@@ -37,17 +37,17 @@ set(SRC
        libmv-capi.h
 )
 
-add_definitions(${GFLAGS_DEFINES})
-add_definitions(${GLOG_DEFINES})
-add_definitions(${CERES_DEFINES})
-
 if(WITH_LIBMV)
+       add_definitions(${GFLAGS_DEFINES})
+       add_definitions(${GLOG_DEFINES})
+       add_definitions(${CERES_DEFINES})
+
        list(APPEND INC
-               ../gflags/src
-               ../glog/src
-               third_party/ceres/include
-               third_party/ceres/config
-               ../../intern/guardedalloc
+               ../../extern/gflags/src
+               ../../extern/glog/src
+               ../../extern/ceres/include
+               ../../extern/ceres/config
+               ../guardedalloc
        )
 
        list(APPEND INC_SYS
@@ -235,4 +235,4 @@ else()
        )
 endif()
 
-blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_libmv "${SRC}" "${INC}" "${INC_SYS}")
similarity index 93%
rename from extern/libmv/bundle.sh
rename to intern/libmv/bundle.sh
index 273365bb31a404abc7753c7aecd05e47d2310acf..e719e592c02db7c970f8eaf369e5d7741f333dda 100755 (executable)
@@ -116,17 +116,17 @@ set(SRC
        libmv-capi.h
 )
 
-add_definitions(\${GFLAGS_DEFINES})
-add_definitions(\${GLOG_DEFINES})
-add_definitions(\${CERES_DEFINES})
-
 if(WITH_LIBMV)
+       add_definitions(\${GFLAGS_DEFINES})
+       add_definitions(\${GLOG_DEFINES})
+       add_definitions(\${CERES_DEFINES})
+
        list(APPEND INC
-               ../gflags/src
-               ../glog/src
-               third_party/ceres/include
-               third_party/ceres/config
-               ../../intern/guardedalloc
+               ../../extern/gflags/src
+               ../../extern/glog/src
+               ../../extern/ceres/include
+               ../../extern/ceres/config
+               ../guardedalloc
        )
 
        list(APPEND INC_SYS
@@ -183,5 +183,5 @@ else()
        )
 endif()
 
-blender_add_lib(extern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}")
+blender_add_lib(bf_intern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}")
 EOF
index 0865efb5ba70f093a7ddb7d70bda3dceb439fa6b..95414db9610ec9796d1d1e7b3bc2e31206c59912 100644 (file)
@@ -49,7 +49,7 @@ set(INC
        ../../../intern/raskter
        ../../../intern/smoke/extern
        ../../../intern/atomic
-       ../../../extern/libmv
+       ../../../intern/libmv
 
        # XXX - BAD LEVEL CALL WM_api.h
        ../windowmanager
index c4ae82cf1aa8b9a84e2379782e1a4b53303603eb..03fcab8dfb0505f6508708fb1e27427afb5514ec 100644 (file)
@@ -173,7 +173,7 @@ endif()
                bf_intern_eigen
                extern_rangetree
                extern_wcwidth
-               extern_libmv
+               bf_intern_libmv
                extern_glog
                extern_gflags
                extern_sdlew
index 9bbf4d97092986faa5b14271bdc4eef3f6691223..3c79465c940a86357e2ae62480bef78afd9eb385 100644 (file)
@@ -49,7 +49,7 @@ if(WIN32)
 endif()
 
 if(WITH_LIBMV)
-       blender_include_dirs(../../extern/libmv)
+       blender_include_dirs(../../intern/libmv)
        add_definitions(-DWITH_LIBMV)
 endif()