[Bf-blender-cvs] [250b485] cmake_libmv_reorganize: Move Libmv from extern/ to intern/

Sergey Sharybin noreply at git.blender.org
Mon Jan 4 14:36:14 CET 2016


Commit: 250b48511292311095eb1f31d2a4633425ce7caa
Author: Sergey Sharybin
Date:   Mon Jan 4 18:22:27 2016 +0500
Branches: cmake_libmv_reorganize
https://developer.blender.org/rB250b48511292311095eb1f31d2a4633425ce7caa

Move Libmv from extern/ to intern/

Logically it is intern library since being mainly developed by 1.5 blender guys.

===================================================================

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

===================================================================

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index e57f93e..3672dbf 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -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
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 3c8e815..632b68e 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -28,7 +28,6 @@ remove_strict_flags()
 
 add_subdirectory(rangetree)
 add_subdirectory(wcwidth)
-add_subdirectory(libmv)
 
 if(WITH_BULLET)
 	if(NOT WITH_SYSTEM_BULLET)
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt
index 275524f..71cbf5d 100644
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@ -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)
diff --git a/extern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt
similarity index 97%
rename from extern/libmv/CMakeLists.txt
rename to intern/libmv/CMakeLists.txt
index 375031f..65f8af5 100644
--- a/extern/libmv/CMakeLists.txt
+++ b/intern/libmv/CMakeLists.txt
@@ -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}")
diff --git a/extern/libmv/ChangeLog b/intern/libmv/ChangeLog
similarity index 100%
rename from extern/libmv/ChangeLog
rename to intern/libmv/ChangeLog
diff --git a/extern/libmv/bundle.sh b/intern/libmv/bundle.sh
similarity index 93%
rename from extern/libmv/bundle.sh
rename to intern/libmv/bundle.sh
index 273365b..e719e59 100755
--- a/extern/libmv/bundle.sh
+++ b/intern/libmv/bundle.sh
@@ -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
diff --git a/extern/libmv/files.txt b/intern/libmv/files.txt
similarity index 100%
rename from extern/libmv/files.txt
rename to intern/libmv/files.txt
diff --git a/extern/libmv/intern/autotrack.cc b/intern/libmv/intern/autotrack.cc
similarity index 100%
rename from extern/libmv/intern/autotrack.cc
rename to intern/libmv/intern/autotrack.cc
diff --git a/extern/libmv/intern/autotrack.h b/intern/libmv/intern/autotrack.h
similarity index 100%
rename from extern/libmv/intern/autotrack.h
rename to intern/libmv/intern/autotrack.h
diff --git a/extern/libmv/intern/camera_intrinsics.cc b/intern/libmv/intern/camera_intrinsics.cc
similarity index 100%
rename from extern/libmv/intern/camera_intrinsics.cc
rename to intern/libmv/intern/camera_intrinsics.cc
diff --git a/extern/libmv/intern/camera_intrinsics.h b/intern/libmv/intern/camera_intrinsics.h
similarity index 100%
rename from extern/libmv/intern/camera_intrinsics.h
rename to intern/libmv/intern/camera_intrinsics.h
diff --git a/extern/libmv/intern/detector.cc b/intern/libmv/intern/detector.cc
similarity index 100%
rename from extern/libmv/intern/detector.cc
rename to intern/libmv/intern/detector.cc
diff --git a/extern/libmv/intern/detector.h b/intern/libmv/intern/detector.h
similarity index 100%
rename from extern/libmv/intern/detector.h
rename to intern/libmv/intern/detector.h
diff --git a/extern/libmv/intern/frame_accessor.cc b/intern/libmv/intern/frame_accessor.cc
similarity index 100%
rename from extern/libmv/intern/frame_accessor.cc
rename to intern/libmv/intern/frame_accessor.cc
diff --git a/extern/libmv/intern/frame_accessor.h b/intern/libmv/intern/frame_accessor.h
similarity index 100%
rename from extern/libmv/intern/frame_accessor.h
rename to intern/libmv/intern/frame_accessor.h
diff --git a/extern/libmv/intern/homography.cc b/intern/libmv/intern/homography.cc
similarity index 100%
rename from extern/libmv/intern/homography.cc
rename to intern/libmv/intern/homography.cc
diff --git a/extern/libmv/intern/homography.h b/intern/libmv/intern/homography.h
similarity index 100%
rename from extern/libmv/intern/homography.h
rename to intern/libmv/intern/homography.h
diff --git a/extern/libmv/intern/image.cc b/intern/libmv/intern/image.cc
similarity index 100%
rename from extern/libmv/intern/image.cc
rename to intern/libmv/intern/image.cc
diff --git a/extern/libmv/intern/image.h b/intern/libmv/intern/image.h
similarity index 100%
rename from extern/libmv/intern/image.h
rename to intern/libmv/intern/image.h
diff --git a/extern/libmv/intern/logging.cc b/intern/libmv/intern/logging.cc
similarity index 100%
rename from extern/libmv/intern/logging.cc
rename to intern/libmv/intern/logging.cc
diff --git a/extern/libmv/intern/logging.h b/intern/libmv/intern/logging.h
similarity index 100%
rename from extern/libmv/intern/logging.h
rename to intern/libmv/intern/logging.h
diff --git a/extern/libmv/intern/reconstruction.cc b/intern/libmv/intern/reconstruction.cc
similarity index 100%
rename from extern/libmv/intern/reconstruction.cc
rename to intern/libmv/intern/reconstruction.cc
diff --git a/extern/libmv/intern/reconstruction.h b/intern/libmv/intern/reconstruction.h
similarity index 100%
rename from extern/libmv/intern/reconstruction.h
rename to intern/libmv/intern/reconstruction.h
diff --git a/extern/libmv/intern/region.h b/intern/libmv/intern/region.h
similarity index 100%
rename from extern/libmv/intern/region.h
rename to intern/libmv/intern/region.h
diff --git a/extern/libmv/intern/stub.cc b/intern/libmv/intern/stub.cc
similarity index 100%
rename from extern/libmv/intern/stub.cc
rename to intern/libmv/intern/stub.cc
diff --git a/extern/libmv/intern/track_region.cc b/intern/libmv/intern/track_region.cc
similarity index 100%
rename from extern/libmv/intern/track_region.cc
rename to intern/libmv/intern/track_region.cc
diff --git a/extern/libmv/intern/track_region.h b/intern/libmv/intern/track_region.h
similarity index 100%
rename from extern/libmv/intern/track_region.h
rename to intern/libmv/intern/track_region.h
diff --git a/extern/libmv/intern/tracks.cc b/intern/libmv/intern/tracks.cc
similarity index 100%
rename from extern/libmv/intern/tracks.cc
rename to intern/libmv/intern/tracks.cc
diff --git a/extern/libmv/intern/tracks.h b/intern/libmv/intern/tracks.h
similarity index 100%
rename from extern/libmv/intern/tracks.h
rename to intern/libmv/intern/tracks.h
diff --git a/extern/libmv/intern/tracksN.cc b/intern/libmv/intern/tracksN.cc
similarity index 100%
rename from extern/libmv/intern/tracksN.cc
rename to intern/libmv/intern/tracksN.cc
diff --git a/extern/libmv/intern/tracksN.h b/intern/libmv/intern/tracksN.h
similarity index 100%
rename from extern/libmv/intern/tracksN.h
rename to intern/libmv/intern/tracksN.h
diff --git a/extern/libmv/intern/utildefines.h b/intern/libmv/intern/utildefines.h
similarity index 100%
rename from extern/libmv/intern/utildefines.h
rename to intern/libmv/intern/utildefines.h
diff --git a/extern/libmv/libmv-capi.h b/intern/libmv/libmv-capi.h
similarity index 100%
rename from extern/libmv/libmv-capi.h
rename to intern/libmv/libmv-capi.h
diff --git a/extern/libmv/libmv/autotrack/autotrack.cc b/intern/libmv/libmv/autotrack/autotrack.cc
similarity index 100%
rename from extern/libmv/libmv/autotrack/autotrack.cc
rename to intern/libmv/libmv/autotrack/autotrack.cc
diff --git a/extern/libmv/libmv/autotrack/autotrack.h b/intern/libmv/libmv/autotrack/autotrack.h
similarity index 100%
rename from extern/libmv/libmv/autotrack/autotrack.h
rename to intern/libmv/libmv/autotrack/autotrack.h
diff --git a/extern/libmv/libmv/autotrack/callbacks.h b/intern/libmv/libmv/autotrack/callbacks.h
similarity index 100%
rename from extern/libmv/libmv/autotrack/callbacks.h
rename to intern/libmv/libmv/autotrack/callbacks.h
diff --git a/extern/libmv/libmv/autotrack/frame_accessor.h b/intern/libmv/libmv/autotrack/frame_accessor.h
similarity index 100%
rename from extern/libmv/libmv/autotrack/frame_accessor.h
rename to intern/libmv/libmv/autotrack/frame_accessor.h
diff --git a/extern/libmv/libmv/autotrack/marker.h b/intern/libmv/libmv/autotrack/marker.h
similarity index 100%
rename from extern/libmv/libmv/autotrack/marker.h
rename to intern/libmv/libmv/autotrack/marker.h
diff --git a/extern/libmv/libmv/autotrack/model.h b/intern/libmv/libmv/autotrack/model.h
similarity index 100%
rename from extern/libmv/libmv/autotrack/model.h
rename to intern/libmv/libmv/autotrack/model.h
diff --git a/extern/libmv/libmv/autotrack/predict_tracks.cc b/intern/libmv/libmv/autotrack/predict_tracks.cc
similarity index 100%
rename from extern/libmv/libmv/autotrack/predict_tracks.cc
rename to intern/libmv/libmv/autotrack/predict_tracks.cc
diff --git a/extern/libmv/libmv/autotrack/predict_tracks.h b/intern/libmv/libmv/autotrack/predict_tracks.h
similarity index 100%
rename from extern/libmv/libmv/autotrack/predict_tracks.h
rename to intern/libmv/libmv/autotrack/predict_tracks.h
diff --git a/extern/libmv/libmv/autotrack/predict_tracks_test.cc b/intern/libmv/libmv/autotrack/predict_tra

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list