[Bf-blender-cvs] [5bf7d98] master: Fix for 771a9dd: libmv build files are automatically generated

[Sergey Sharybin]

Commit: 5bf7d988ac67fdc537114afefe08a4c87be24f1c
Author: Sergey Sharybin
Date:   Thu Apr 17 22:36:07 2014 +0600
https://developer.blender.org/rB5bf7d988ac67fdc537114afefe08a4c87be24f1c

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.

===================================================================

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

===================================================================

diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript
index fdce24d..72acb4b 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 238cd50..ef651f1 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'