Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2020-06-18 11:12:01 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2020-06-19 13:02:21 +0300
commit31ae83381106a7aaee5303710b818c13f42ceddc (patch)
tree6935ebe7e84db7e54c689ea3308fb6df67e03d73 /extern/ceres/bundle.sh
parent171c4fb238a2a65291540ac5406187bc69f3a6bc (diff)
Ceres: Update to the latest upstream version
Using latest master because of various compilation error fixes. Brings a lot of recent development. From most interesting parts: - New threading model. - Tiny solver. - Compatibility with C++17.
Diffstat (limited to 'extern/ceres/bundle.sh')
-rwxr-xr-xextern/ceres/bundle.sh9
1 files changed, 2 insertions, 7 deletions
diff --git a/extern/ceres/bundle.sh b/extern/ceres/bundle.sh
index 02af59faf28..573db5a0a2f 100755
--- a/extern/ceres/bundle.sh
+++ b/extern/ceres/bundle.sh
@@ -9,7 +9,6 @@ fi
repo="https://ceres-solver.googlesource.com/ceres-solver"
branch="master"
-#tag="1.4.0"
tag=""
tmp=`mktemp -d`
checkout="$tmp/ceres"
@@ -157,14 +156,10 @@ add_definitions(
-DCERES_NO_SUITESPARSE
-DCERES_NO_CXSPARSE
-DCERES_NO_LAPACK
+ -DCERES_NO_ACCELERATE_SPARSE
-DCERES_HAVE_RWLOCK
+ -DCERES_USE_CXX_THREADS
)
-if(WITH_OPENMP)
- add_definitions(
- -DCERES_USE_OPENMP
- )
-endif()
-
blender_add_lib(extern_ceres "\${SRC}" "\${INC}" "\${INC_SYS}" "\${LIB}")
EOF