[Bf-blender-cvs] [cefa733] master: Followup for 90a86fe: libmv/ceres cmake/scons files are automatically generated

Sergey Sharybin noreply at git.blender.org
Mon Feb 24 15:13:45 CET 2014


Commit: cefa73380377a68395d8de5b8a4570db80f5fd83
Author: Sergey Sharybin
Date:   Mon Feb 24 20:12:17 2014 +0600
https://developer.blender.org/rBcefa73380377a68395d8de5b8a4570db80f5fd83

Followup for 90a86fe: libmv/ceres cmake/scons files are automatically generated

So don't forget to update generator scripts as well.

===================================================================

M	extern/libmv/third_party/ceres/bundle.sh

===================================================================

diff --git a/extern/libmv/third_party/ceres/bundle.sh b/extern/libmv/third_party/ceres/bundle.sh
index d937ed4..f6e6084 100755
--- a/extern/libmv/third_party/ceres/bundle.sh
+++ b/extern/libmv/third_party/ceres/bundle.sh
@@ -225,6 +225,9 @@ else()
 	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




More information about the Bf-blender-cvs mailing list