SCons: Don't compile libmv stub when libmv is actually enabled
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 26 Sep 2014 08:28:04 +0000 (14:28 +0600)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 26 Sep 2014 08:28:04 +0000 (14:28 +0600)
Really weird linux and windows didn't have duplicated symbols error.

extern/libmv/SConscript
extern/libmv/bundle.sh

index 857d7dec7d4955081d1c150f264de2f009e42070..162fb88df53a09154c6e09856a3bc7c13bd09c2a 100644 (file)
@@ -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')
index d394d2cd8c5329c9562a0ecb8be748ed98ccd7ba..f37ab1fcff966639996a32f5bd53f47376829dba 100755 (executable)
@@ -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'