diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-31 13:55:00 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-31 14:02:04 +0300 |
| commit | caa2306d16e879659cdbef4ec54752637fb5c474 (patch) | |
| tree | 1255c9cdbdc9d18f67b40cb755ca58897e5cefd2 /extern/libmv/bundle.sh | |
| parent | 784517dfb9650f284d5f7e283b47233c00183686 (diff) | |
Libmv: Update to latest upstream version
Main purpose of this is to bring new gflags library which is more likely
to have a fix for undefined order of static variables initialization and
also to bring new glog where some compilation error are fixed (which are
only visible with more strict checks with clang and c++11 enabled).
Diffstat (limited to 'extern/libmv/bundle.sh')
| -rwxr-xr-x | extern/libmv/bundle.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh index 002e3816c71..f8aaaa966f4 100755 --- a/extern/libmv/bundle.sh +++ b/extern/libmv/bundle.sh @@ -133,6 +133,7 @@ set(SRC if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) list(APPEND INC third_party/gflags + third_party/gflags/gflags third_party/glog/src third_party/ceres/include third_party/ceres/config @@ -294,7 +295,7 @@ if env['WITH_BF_LIBMV'] or (env['WITH_BF_CYCLES'] and env['WITH_BF_CYCLES_LOGGIN defs.append('WITH_LIBMV_GUARDED_ALLOC') defs.append('LIBMV_NO_FAST_DETECTOR') - incs += ' ../Eigen3 third_party/gflags third_party/glog/src third_party/ceres/include third_party/ceres/config ../../intern/guardedalloc' + incs += ' ../Eigen3 third_party/gflags third_party/gflags/gflags third_party/glog/src third_party/ceres/include third_party/ceres/config ../../intern/guardedalloc' incs += ' ' + env['BF_PNG_INC'] incs += ' ' + env['BF_ZLIB_INC'] |