[Bf-blender-cvs] [ddc9596] master: Fix for own commit: mixed up ceres build defines when replacing cmake check with a generalized macro.
Lukas Tönne
noreply at git.blender.org
Tue Mar 25 09:56:07 CET 2014
Commit: ddc959691a41b4b151a7e9df0eb7267e2d8f77a3
Author: Lukas Tönne
Date: Tue Mar 25 09:49:39 2014 +0100
https://developer.blender.org/rBddc959691a41b4b151a7e9df0eb7267e2d8f77a3
Fix for own commit: mixed up ceres build defines when replacing cmake
check with a generalized macro.
rBbbfcb0b1e44636b73b8c46f1cb800fa53dda5277
===================================================================
M extern/libmv/third_party/ceres/CMakeLists.txt
===================================================================
diff --git a/extern/libmv/third_party/ceres/CMakeLists.txt b/extern/libmv/third_party/ceres/CMakeLists.txt
index baa619f..1683264 100644
--- a/extern/libmv/third_party/ceres/CMakeLists.txt
+++ b/extern/libmv/third_party/ceres/CMakeLists.txt
@@ -323,7 +323,7 @@ if(HAVE_STD_UNORDERED_MAP_HEADER)
endif()
else()
if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
- add_definitions(-DCERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)
+ add_definitions(-DCERES_TR1_UNORDERED_MAP)
else()
add_definitions(-DCERES_NO_UNORDERED_MAP)
message(STATUS "Replacing unordered_map/set with map/set (warning: slower!)")
More information about the Bf-blender-cvs
mailing list