From 5bf7d988ac67fdc537114afefe08a4c87be24f1c Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 17 Apr 2014 22:36:07 +0600 Subject: Fix for 771a9dd: libmv build files are automatically generated This means if one makes change to either SConscript or CMakeLists.txt there he MUST update bundle.sh. Also made it so *.cc files from intern/libmv are matching which would make it easier to add more .cc files there if needed. And one more thing is removing 'simple_pipeline/distortion_models.cc' which doesn't match any of the files. --- extern/libmv/SConscript | 4 +--- extern/libmv/bundle.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript index fdce24dcefe..72acb4bc323 100644 --- a/extern/libmv/SConscript +++ b/extern/libmv/SConscript @@ -18,10 +18,8 @@ if env['WITH_BF_LIBMV']: defs.append('WITH_LIBMV_GUARDED_ALLOC') defs.append('LIBMV_NO_FAST_DETECTOR') - src = env.Glob('libmv-capi.cc') - src += env.Glob('libmv-util.cc') + src = env.Glob('*.cc') src += env.Glob('libmv/image/*.cc') - src += env.Glob('simple_pipeline/distortion_models.cc') src += env.Glob('libmv/multiview/*.cc') src += env.Glob('libmv/numeric/*.cc') src += env.Glob('libmv/simple_pipeline/*.cc') diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh index 238cd503f57..ef651f10cd1 100755 --- a/extern/libmv/bundle.sh +++ b/extern/libmv/bundle.sh @@ -234,7 +234,7 @@ if env['WITH_BF_LIBMV']: defs.append('WITH_LIBMV_GUARDED_ALLOC') defs.append('LIBMV_NO_FAST_DETECTOR') - src = env.Glob("libmv-capi.cc") + src = env.Glob("*.cc") $src incs += ' ../Eigen3 third_party/gflags third_party/glog/src third_party/ceres/include ../../intern/guardedalloc' -- cgit v1.2.3