diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-08 17:44:10 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-08 17:44:10 +0400 |
| commit | a3ec6edc05a4d4819d7e9ba448f74c3cc5f695bc (patch) | |
| tree | 1d5af09498a680e61c6b8f6d61d3601f68e78bbc /extern | |
| parent | 8a717f83260e0402970ed770a342efaf1cf9a27e (diff) | |
OSX/scons: make MACOSX_SDK_CHECK a local var is sconstruct and remove from env, also fix a longstanding misuse of MACOSX_SDK_CHECK in ceres, use MACOSX_SDK instead
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/third_party/ceres/SConscript | 2 | ||||
| -rwxr-xr-x | extern/libmv/third_party/ceres/bundle.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extern/libmv/third_party/ceres/SConscript b/extern/libmv/third_party/ceres/SConscript index a914135fddc..164aedfe415 100644 --- a/extern/libmv/third_party/ceres/SConscript +++ b/extern/libmv/third_party/ceres/SConscript @@ -28,7 +28,7 @@ defs.append('CERES_HAVE_RWLOCK') if env['WITH_BF_OPENMP']: defs.append('CERES_USE_OPENMP') -if 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']: +if 'Mac OS X 10.5' in env['MACOSX_SDK']: defs.append('CERES_NO_TR1') incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags' diff --git a/extern/libmv/third_party/ceres/bundle.sh b/extern/libmv/third_party/ceres/bundle.sh index 6ab348af118..a6f040b6d29 100755 --- a/extern/libmv/third_party/ceres/bundle.sh +++ b/extern/libmv/third_party/ceres/bundle.sh @@ -225,7 +225,7 @@ defs.append('CERES_HAVE_RWLOCK') if env['WITH_BF_OPENMP']: defs.append('CERES_USE_OPENMP') -if 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']: +if 'Mac OS X 10.5' in env['MACOSX_SDK']: defs.append('CERES_NO_TR1') incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags' |