diff options
Diffstat (limited to 'extern/libmv/CMakeLists.txt')
| -rw-r--r-- | extern/libmv/CMakeLists.txt | 93 |
1 files changed, 57 insertions, 36 deletions
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt index 6a4a61ea779..089743567f0 100644 --- a/extern/libmv/CMakeLists.txt +++ b/extern/libmv/CMakeLists.txt @@ -37,13 +37,42 @@ set(SRC libmv-capi.h ) -if(WITH_LIBMV) +if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) + list(APPEND INC + third_party/gflags + third_party/gflags/gflags + third_party/glog/src + third_party/ceres/include + third_party/ceres/config + ../../intern/guardedalloc + ) + + list(APPEND INC_SYS + ${EIGEN3_INCLUDE_DIRS} + ${PNG_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIRS} + ) + + if(WIN32) + list(APPEND INC + third_party/glog/src/windows + ) + + if(NOT MINGW) + list(APPEND INC + third_party/msinttypes + ) + endif() + endif() + add_definitions( -DWITH_LIBMV_GUARDED_ALLOC -DGOOGLE_GLOG_DLL_DECL= -DLIBMV_NO_FAST_DETECTOR= ) +endif() +if(WITH_LIBMV) TEST_SHARED_PTR_SUPPORT() if(SHARED_PTR_FOUND) if(SHARED_PTR_TR1_MEMORY_HEADER) @@ -56,29 +85,21 @@ if(WITH_LIBMV) message(FATAL_ERROR "Unable to find shared_ptr.") endif() - list(APPEND INC - third_party/gflags - third_party/glog/src - third_party/ceres/include - third_party/ceres/config - ../../intern/guardedalloc - ) - - set(INC_SYS - ../Eigen3 - ${PNG_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIRS} - ) - list(APPEND SRC + intern/autotrack.cc intern/camera_intrinsics.cc intern/detector.cc + intern/frame_accessor.cc intern/homography.cc intern/image.cc intern/logging.cc intern/reconstruction.cc intern/track_region.cc intern/tracks.cc + intern/tracksN.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 @@ -114,14 +135,27 @@ if(WITH_LIBMV) libmv/tracking/trklt_region_tracker.cc + intern/autotrack.h intern/camera_intrinsics.h intern/detector.h + intern/frame_accessor.h intern/homography.h intern/image.h intern/logging.h intern/reconstruction.h intern/track_region.h intern/tracks.h + intern/tracksN.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 +205,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 @@ -182,21 +217,12 @@ if(WITH_LIBMV) third_party/msinttypes/stdint.h ) - if(WIN32) - list(APPEND INC - third_party/glog/src/windows - ) - - if(NOT MINGW) - list(APPEND INC - third_party/msinttypes - ) - endif() - endif() 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") @@ -240,7 +266,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 OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) # We compile GLog together with GFlag so we don't worry about # adding extra lib to linker. set(GLOG_SRC @@ -281,6 +307,9 @@ if(WITH_LIBMV OR WITH_GTESTS OR WITH_CYCLES_LOGGING) third_party/glog/src/windows/glog/log_severity.h third_party/glog/src/windows/port.h third_party/glog/src/windows/config.h + + third_party/gflags/windows_port.cc + third_party/gflags/windows_port.h ) else() list(APPEND GLOG_SRC @@ -316,13 +345,5 @@ if(WITH_LIBMV OR WITH_GTESTS OR WITH_CYCLES_LOGGING) ) endif() - set(GLOG_INC - third_party/gflags - third_party/glog/src - ) - - set(GLOG_INC_SYS - ) - - blender_add_lib(extern_glog "${GLOG_SRC}" "${GLOG_INC}" "${GLOG_INC_SYS}") + blender_add_lib(extern_glog "${GLOG_SRC}" "${INC}" "${INC_SYS}") endif() |