diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-16 16:24:54 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-16 16:24:54 +0400 |
commit | a4992871d62b50cd9e6ea2fb4863aab6193ac774 (patch) | |
tree | 1c03589d60abb84dfab6feaa7acbe3b06dd92082 /extern/libmv/third_party/ceres/bundle.sh | |
parent | 02ef4cc33db22cbd6cd68bcfea55395ebc2b8eb5 (diff) |
Ceres: tweak namespace for hash classes for MSVC2010
Not sure if it'll solve all issues, but at least it should reduce
amount of errors.
Also added missed patch from previous commit.
Diffstat (limited to 'extern/libmv/third_party/ceres/bundle.sh')
-rwxr-xr-x | extern/libmv/third_party/ceres/bundle.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/extern/libmv/third_party/ceres/bundle.sh b/extern/libmv/third_party/ceres/bundle.sh index 8689f58ae4c..94ab8f87df6 100755 --- a/extern/libmv/third_party/ceres/bundle.sh +++ b/extern/libmv/third_party/ceres/bundle.sh @@ -156,14 +156,24 @@ endif() add_definitions( -DCERES_HAVE_PTHREAD - -D"CERES_HASH_NAMESPACE_START=namespace std { namespace tr1 {" - -D"CERES_HASH_NAMESPACE_END=}}" -DCERES_NO_SUITESPARSE -DCERES_NO_CXSPARSE -DCERES_NO_PROTOCOL_BUFFERS -DCERES_RESTRICT_SCHUR_SPECIALIZATION ) +if(MSVC10) + add_definitions( + -D"CERES_HASH_NAMESPACE_START=namespace std {" + -D"CERES_HASH_NAMESPACE_END=}" + ) +else() + add_definitions( + -D"CERES_HASH_NAMESPACE_START=namespace std { namespace tr1 {" + -D"CERES_HASH_NAMESPACE_END=}}" + ) +endif() + if(APPLE) if(${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.5") add_definitions( |