From cf148edb26d98d1b4a2c0b319c13223a0250092e Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 25 Mar 2014 15:07:19 +0600 Subject: Followup to Ceres changes -- need to update bundling script --- extern/libmv/third_party/ceres/bundle.sh | 90 +++++++++----------------------- 1 file changed, 25 insertions(+), 65 deletions(-) (limited to 'extern') diff --git a/extern/libmv/third_party/ceres/bundle.sh b/extern/libmv/third_party/ceres/bundle.sh index f6e60848907..7cb6b9beefd 100755 --- a/extern/libmv/third_party/ceres/bundle.sh +++ b/extern/libmv/third_party/ceres/bundle.sh @@ -174,60 +174,27 @@ if(WITH_OPENMP) ) endif() -include(CheckIncludeFileCXX) -CHECK_INCLUDE_FILE_CXX(unordered_map HAVE_STD_UNORDERED_MAP_HEADER) +TEST_UNORDERED_MAP_SUPPORT() if(HAVE_STD_UNORDERED_MAP_HEADER) - # Even so we've found unordered_map header file it doesn't - # mean unordered_map and unordered_set will be declared in - # std namespace. - # - # Namely, MSVC 2008 have unordered_map header which declares - # unordered_map class in std::tr1 namespace. In order to support - # this, we do extra check to see which exactly namespace is - # to be used. - - include(CheckCXXSourceCompiles) - CHECK_CXX_SOURCE_COMPILES("#include - int main() { - std::unordered_map map; - return 0; - }" - HAVE_UNURDERED_MAP_IN_STD_NAMESPACE) - if(HAVE_UNURDERED_MAP_IN_STD_NAMESPACE) + if(HAVE_UNORDERED_MAP_IN_STD_NAMESPACE) add_definitions(-DCERES_STD_UNORDERED_MAP) - message(STATUS "Found unordered_map/set in std namespace.") else() - CHECK_CXX_SOURCE_COMPILES("#include - int main() { - std::tr1::unordered_map map; - return 0; - }" - HAVE_UNURDERED_MAP_IN_TR1_NAMESPACE) - if(HAVE_UNURDERED_MAP_IN_TR1_NAMESPACE) + if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE) add_definitions(-DCERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE) - message(STATUS "Found unordered_map/set in std::tr1 namespace.") else() - message(STATUS "Found but cannot find either std::unordered_map " - "or std::tr1::unordered_map.") - message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)") add_definitions(-DCERES_NO_UNORDERED_MAP) + message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)") endif() endif() else() - CHECK_INCLUDE_FILE_CXX("tr1/unordered_map" UNORDERED_MAP_IN_TR1_NAMESPACE) - if(UNORDERED_MAP_IN_TR1_NAMESPACE) + if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE) add_definitions(-DCERES_TR1_UNORDERED_MAP) - message(STATUS "Found unordered_map/set in std::tr1 namespace.") else() - message(STATUS "Unable to find or . ") - message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)") add_definitions(-DCERES_NO_UNORDERED_MAP) + message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)") endif() endif() -unset(HAVE_UNURDERED_MAP_IN_TR1_NAMESPACE) -unset(HAVE_STD_UNORDERED_MAP_HEADER) - blender_add_lib(extern_ceres "\${SRC}" "\${INC}" "\${INC_SYS}") EOF @@ -241,6 +208,8 @@ cat > SConscript << EOF import sys import os +from unordered_map import test_unordered_map + Import('env') src = [] @@ -261,35 +230,26 @@ defs.append('CERES_HAVE_RWLOCK') if env['WITH_BF_OPENMP']: defs.append('CERES_USE_OPENMP') +def define_unordered_map(conf): + found, namespace, include_prefix = test_unordered_map(conf) + if found: + if not include_prefix: + if namespace == 'std': + defs.append('CERES_STD_UNORDERED_MAP') + return True + elif namespace == 'std::tr1': + defs.append('CERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE') + return True + else: + if namespace == 'std::tr1': + defs.append('CERES_TR1_UNORDERED_MAP') + return True + return False + conf = Configure(env) -if conf.CheckCXXHeader("unordered_map"): - # Even so we've found unordered_map header file it doesn't - # mean unordered_map and unordered_set will be declared in - # std namespace. - # - # Namely, MSVC 2008 have unordered_map header which declares - # unordered_map class in std::tr1 namespace. In order to support - # this, we do extra check to see which exactly namespace is - # to be used. - - if conf.CheckType('std::unordered_map', language = 'CXX', includes="#include "): - defs.append('CERES_STD_UNORDERED_MAP') - print("-- Found unordered_map/set in std namespace.") - elif conf.CheckType('std::tr1::unordered_map', language = 'CXX', includes="#include "): - defs.append('CERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE') - print("-- Found unordered_map/set in std::tr1 namespace.") - else: - print("-- Found but can not find neither std::unordered_map nor std::tr1::unordered_map.") - print("-- Replacing unordered_map/set with map/set (warning: slower!)") - defs.append('CERES_NO_UNORDERED_MAP') -elif conf.CheckCXXHeader("tr1/unordered_map"): - defs.append('CERES_TR1_UNORDERED_MAP') - print("-- Found unordered_map/set in std::tr1 namespace.") -else: - print("-- Unable to find or . ") +if not define_unordered_map(conf): print("-- Replacing unordered_map/set with map/set (warning: slower!)") defs.append('CERES_NO_UNORDERED_MAP') - env = conf.Finish() incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags' -- cgit v1.2.3