diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-05-02 03:52:56 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-27 12:08:27 +0400 |
| commit | 72ac596e19ddb37636e107635b52ee78888460e7 (patch) | |
| tree | 5b94775ba0528366a07114c8d47859f485c725e0 /extern/libmv/bundle.sh | |
| parent | 0a0e4e0e698eb496c4fb18c79b532104581ce0af (diff) | |
Update Ceres to latest upstream version
Brings new bounds limiting and also prepares build system
for the changes in the upstream.
Namely shared_ptr header and namespace is now being detected
by a build system rather than by hacks in the code.
This commit includes some changes to auto-detection flags
in SCons, presumably adding more consistency there. This
is main changes which are suppoed to be reviewed here.
Reviewers: campbellbarton
Differential Revision: https://developer.blender.org/D581
Diffstat (limited to 'extern/libmv/bundle.sh')
| -rwxr-xr-x | extern/libmv/bundle.sh | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh index 32f7311ca96..0560ab0acd2 100755 --- a/extern/libmv/bundle.sh +++ b/extern/libmv/bundle.sh @@ -139,10 +139,23 @@ if(WITH_LIBMV) -DLIBMV_NO_FAST_DETECTOR= ) + TEST_SHARED_PTR_SUPPORT() + if(SHARED_PTR_FOUND) + if(SHARED_PTR_TR1_MEMORY_HEADER) + add_definitions(-DCERES_TR1_MEMORY_HEADER) + endif() + if(SHARED_PTR_TR1_NAMESPACE) + add_definitions(-DCERES_TR1_SHARED_PTR) + endif() + else() + message(FATAL_ERROR "Unable to find shared_ptr.") + endif() + list(APPEND INC third_party/gflags third_party/glog/src third_party/ceres/include + third_party/ceres/config ../../intern/guardedalloc ) @@ -264,6 +277,15 @@ defs = [] incs = '.' if env['WITH_BF_LIBMV']: + if not env['WITH_SHARED_PTR_SUPPORT']: + print("-- Unable to find shared_ptr which is required for compilation.") + exit(1) + + if env['SHARED_PTR_HEADER'] == 'tr1/memory': + defs.append('CERES_TR1_MEMORY_HEADER') + if env['SHARED_PTR_NAMESPACE'] == 'std::tr1': + defs.append('CERES_TR1_SHARED_PTR') + defs.append('GOOGLE_GLOG_DLL_DECL=') defs.append('WITH_LIBMV') defs.append('WITH_LIBMV_GUARDED_ALLOC') @@ -272,7 +294,7 @@ if env['WITH_BF_LIBMV']: src = env.Glob('*.cc') $src - incs += ' ../Eigen3 third_party/gflags third_party/glog/src third_party/ceres/include ../../intern/guardedalloc' + incs += ' ../Eigen3 third_party/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'] |