diff options
Diffstat (limited to 'extern/libmv/CMakeLists.txt')
| -rw-r--r-- | extern/libmv/CMakeLists.txt | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt index 09c36fc4383..bd27228ec14 100644 --- a/extern/libmv/CMakeLists.txt +++ b/extern/libmv/CMakeLists.txt @@ -66,7 +66,7 @@ if(WITH_LIBMV) list(APPEND INC_SYS ../Eigen3 - ${PNG_INCLUDE_DIRS} + ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} ) @@ -79,6 +79,9 @@ if(WITH_LIBMV) intern/reconstruction.cc intern/track_region.cc intern/tracks.cc + libmv/autotrack/autotrack.cc + libmv/autotrack/predict_tracks.cc + libmv/autotrack/tracks.cc libmv/base/aligned_malloc.cc libmv/image/array_nd.cc libmv/image/convolve.cc @@ -122,6 +125,16 @@ if(WITH_LIBMV) intern/reconstruction.h intern/track_region.h intern/tracks.h + libmv/autotrack/autotrack.h + libmv/autotrack/callbacks.h + libmv/autotrack/frame_accessor.h + libmv/autotrack/marker.h + libmv/autotrack/model.h + libmv/autotrack/predict_tracks.h + libmv/autotrack/quad.h + libmv/autotrack/reconstruction.h + libmv/autotrack/region.h + libmv/autotrack/tracks.h libmv/base/aligned_malloc.h libmv/base/id_generator.h libmv/base/scoped_ptr.h @@ -171,6 +184,7 @@ if(WITH_LIBMV) libmv/simple_pipeline/tracks.h libmv/tracking/brute_region_tracker.h libmv/tracking/hybrid_region_tracker.h + libmv/tracking/kalman_filter.h libmv/tracking/klt_region_tracker.h libmv/tracking/pyramid_region_tracker.h libmv/tracking/region_tracker.h @@ -197,6 +211,8 @@ if(WITH_LIBMV) if(WITH_GTESTS) blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "" "") + BLENDER_SRC_GTEST("libmv_predict_tracks" "./libmv/autotrack/predict_tracks_test.cc" "libmv_test_dataset;extern_libmv;extern_ceres") + BLENDER_SRC_GTEST("libmv_tracks" "./libmv/autotrack/tracks_test.cc" "libmv_test_dataset;extern_libmv;extern_ceres") BLENDER_SRC_GTEST("libmv_scoped_ptr" "./libmv/base/scoped_ptr_test.cc" "libmv_test_dataset;extern_libmv;extern_ceres") BLENDER_SRC_GTEST("libmv_vector" "./libmv/base/vector_test.cc" "libmv_test_dataset;extern_libmv;extern_ceres") BLENDER_SRC_GTEST("libmv_array_nd" "./libmv/image/array_nd_test.cc" "libmv_test_dataset;extern_libmv;extern_ceres") @@ -229,7 +245,7 @@ if(WITH_LIBMV) endif() else() list(APPEND SRC - intern/stub.cc + libmv-capi_stub.cc ) endif() @@ -240,7 +256,7 @@ if(WITH_LIBMV) endif() # make GLog a separate target, so it can be used for gtest as well. -if(WITH_LIBMV OR WITH_GTESTS OR WITH_CYCLES_LOGGING) +if(WITH_LIBMV OR WITH_GTESTS) # We compile GLog together with GFlag so we don't worry about # adding extra lib to linker. set(GLOG_SRC |