Merge commit '660e37537636b000eda180f74b3bbaf53e52613b' into master
Upgrade ceres to the 2.0.0 release before starting to use it seriously
Change-Id: I89dd4bb1c1044d9034a254f9e2c4c03952f958a2
diff --git a/third_party/ceres/bazel/ceres.bzl b/third_party/ceres/bazel/ceres.bzl
index b33aeb3..fff9c30 100644
--- a/third_party/ceres/bazel/ceres.bzl
+++ b/third_party/ceres/bazel/ceres.bzl
@@ -137,9 +137,7 @@
# like SuiteSparse or not, threading or not, glog or not, and so on.
# See https://github.com/ceres-solver/ceres-solver/issues/335.
def ceres_library(name,
- restrict_schur_specializations=False,
- extra_copts=[],
- gflags_namespace="gflags"):
+ restrict_schur_specializations=False):
# The path to internal/ depends on whether Ceres is the main workspace or
# an external repository.
if native.repository_name() != '@':
@@ -184,10 +182,9 @@
copts = [
"-I" + internal,
"-Wno-sign-compare",
- "-Wno-ignored-qualifiers",
- "-Wno-unused-parameter",
"-Wno-format-nonliteral",
- ] + schur_eliminator_copts + extra_copts,
+ "-Wno-unused-parameter",
+ ] + schur_eliminator_copts,
# These include directories and defines are propagated to other targets
# depending on Ceres.
@@ -201,8 +198,7 @@
"CERES_NO_ACCELERATE_SPARSE",
"CERES_NO_LAPACK",
"CERES_USE_EIGEN_SPARSE",
- "CERES_USE_CXX11_THREADS",
- "CERES_GFLAGS_NAMESPACE=" + gflags_namespace,
+ "CERES_USE_CXX_THREADS",
],
includes = [
"config",