diff options
Diffstat (limited to 'extern/libmv/SConscript')
| -rw-r--r-- | extern/libmv/SConscript | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript index a267c96520e..6156dd45146 100644 --- a/extern/libmv/SConscript +++ b/extern/libmv/SConscript @@ -6,6 +6,7 @@ import sys import os +from FindSharedPtr import FindSharedPtr Import('env') @@ -13,6 +14,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') @@ -27,7 +37,7 @@ if env['WITH_BF_LIBMV']: src += env.Glob('libmv/tracking/*.cc') src += env.Glob('third_party/gflags/*.cc') - 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'] |