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.
This commit is contained in:
Sergey Sharybin 2014-04-17 22:36:07 +06:00
parent a86d8bceb5
commit 5bf7d988ac
2 changed files with 2 additions and 4 deletions

@ -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')

@ -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'