diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-09-26 12:28:04 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-09-26 12:28:04 +0400 |
| commit | 58a9569628c96ecf471c2ad42a73ae8ff6cd398c (patch) | |
| tree | 1c41a87b868e585ed1528aae6b51b8241e48aead /extern/libmv | |
| parent | 4832538ad08198f88444997c55ca5ff2f9da4458 (diff) | |
SCons: Don't compile libmv stub when libmv is actually enabled
Really weird linux and windows didn't have duplicated symbols error.
Diffstat (limited to 'extern/libmv')
| -rw-r--r-- | extern/libmv/SConscript | 1 | ||||
| -rwxr-xr-x | extern/libmv/bundle.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript index 857d7dec7d4..162fb88df53 100644 --- a/extern/libmv/SConscript +++ b/extern/libmv/SConscript @@ -28,6 +28,7 @@ if env['WITH_BF_LIBMV']: defs.append('LIBMV_NO_FAST_DETECTOR') src = env.Glob('intern/*.cc') + src.remove('intern' + os.sep + 'stub.cc') src += env.Glob('libmv/base/*.cc') src += env.Glob('libmv/image/*.cc') src += env.Glob('libmv/multiview/*.cc') diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh index d394d2cd8c5..f37ab1fcff9 100755 --- a/extern/libmv/bundle.sh +++ b/extern/libmv/bundle.sh @@ -307,6 +307,7 @@ if env['WITH_BF_LIBMV']: defs.append('LIBMV_NO_FAST_DETECTOR') src = env.Glob('intern/*.cc') + src.remove('intern' + os.sep + 'stub.cc') $src incs += ' ../Eigen3 third_party/gflags third_party/glog/src third_party/ceres/include third_party/ceres/config ../../intern/guardedalloc' |