diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-16 16:23:00 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-16 16:23:00 +0400 |
| commit | d066ce9533995e8d1c712d47dfe093533d921a6f (patch) | |
| tree | 9b0ba8143c3fb75b5c3cd9fc30d7c504d8380309 /extern | |
| parent | a9d9bf7909ce3e43b3d6293dee87638f759011f2 (diff) | |
Ceres: remove debug-only code from bundling script, also move osx workaround to template
Diffstat (limited to 'extern')
| -rwxr-xr-x | extern/libmv/third_party/ceres/bundle.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/extern/libmv/third_party/ceres/bundle.sh b/extern/libmv/third_party/ceres/bundle.sh index 99aaadd8d87..30181756c5c 100755 --- a/extern/libmv/third_party/ceres/bundle.sh +++ b/extern/libmv/third_party/ceres/bundle.sh @@ -1,6 +1,5 @@ #!/bin/sh -if false; then if [ "x$1" = "x--i-really-know-what-im-doing" ] ; then echo Proceeding as requested by command line ... else @@ -37,8 +36,6 @@ done rm -rf $tmp -fi - sources=`find ./include ./internal -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//\t/' | grep -v -E 'schur_eliminator_[0-9]_[0-9]_[0-9d].cc' | sort -d` generated_sources=`find ./include ./internal -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//#\t\t/' | grep -E 'schur_eliminator_[0-9]_[0-9]_[0-9d].cc' | sort -d` headers=`find ./include ./internal -type f -iname '*.h' | sed -r 's/^\.\//\t/' | sort -d` @@ -191,6 +188,11 @@ defs.append('CERES_RESTRICT_SCHUR_SPECIALIZATION') incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags' +# work around broken hashtable in 10.5 SDK +if env['OURPLATFORM'] == 'darwin' and env['WITH_BF_BOOST']: + incs += ' ' + env['BF_BOOST_INC'] + defs.append('CERES_HASH_BOOST') + if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): incs += ' ../msinttypes' |