diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-17 20:36:07 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-17 20:38:31 +0400 |
| commit | 5bf7d988ac67fdc537114afefe08a4c87be24f1c (patch) | |
| tree | ec65f7995e4d220389a9ba0f2bafda40d6229516 /extern | |
| parent | a86d8bceb50b99630a14fa03b39977e6eec20b1c (diff) | |
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.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/SConscript | 4 | ||||
| -rwxr-xr-x | 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' |