From 58a9569628c96ecf471c2ad42a73ae8ff6cd398c Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 26 Sep 2014 14:28:04 +0600 Subject: SCons: Don't compile libmv stub when libmv is actually enabled Really weird linux and windows didn't have duplicated symbols error. --- extern/libmv/SConscript | 1 + extern/libmv/bundle.sh | 1 + 2 files changed, 2 insertions(+) (limited to 'extern/libmv') 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' -- cgit v1.2.3