diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-04 16:11:12 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-04 17:39:13 +0300 |
| commit | 6fb6a08bf84d5d16ebac35527a77bec37112494e (patch) | |
| tree | 9315b37d5022881ada9efcc8bc42a7387500ff0c /CMakeLists.txt | |
| parent | 0b856dd97e43cf116ac136b74bc3a559c679522e (diff) | |
Move Ceres to extern/
Even tho it's currently only used by Libmv we might use it for something
else in the future. Plus, it's actually where it logically belongs to.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b04a771f17c..a4206c30a63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2601,6 +2601,46 @@ if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) endif() #----------------------------------------------------------------------------- +# Configure Ceres + +if(WITH_LIBMV) + set(CERES_DEFINES) + + TEST_SHARED_PTR_SUPPORT() + if(SHARED_PTR_FOUND) + if(SHARED_PTR_TR1_MEMORY_HEADER) + list(APPEND CERES_DEFINES -DCERES_TR1_MEMORY_HEADER) + endif() + if(SHARED_PTR_TR1_NAMESPACE) + list(APPEND CERES_DEFINES -DCERES_TR1_SHARED_PTR) + endif() + else() + message(FATAL_ERROR "Ceres: Unable to find shared_ptr.") + endif() + + TEST_UNORDERED_MAP_SUPPORT() + if(HAVE_STD_UNORDERED_MAP_HEADER) + if(HAVE_UNORDERED_MAP_IN_STD_NAMESPACE) + list(APPEND CERES_DEFINES -DCERES_STD_UNORDERED_MAP) + else() + if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE) + list(APPEND CERES_DEFINES -DCERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE) + else() + list(APPEND CERES_DEFINES -DCERES_NO_UNORDERED_MAP) + message(STATUS "Ceres: Replacing unordered_map/set with map/set (warning: slower!)") + endif() + endif() + else() + if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE) + list(APPEND CERES_DEFINES -DCERES_TR1_UNORDERED_MAP) + else() + list(APPEND CERES_DEFINES -DCERES_NO_UNORDERED_MAP) + message(STATUS "Ceres: Replacing unordered_map/set with map/set (warning: slower!)") + endif() + endif() +endif() + +#----------------------------------------------------------------------------- # Extra compile flags if(CMAKE_COMPILER_IS_GNUCC) |