Update Bazel WORKSPACE for newest Bazel The latest Bazel releases have deprecated Bazel-native "http_archive()" directive in favor of a Skylark version. This updates the WORKSPACE to use the new format, as well as removing the Eigen BUILD in favor of a string in the WORKSPACE. Fixes: https://github.com/ceres-solver/ceres-solver/issues/463 Change-Id: I2f7051316dbe0c1f283423c56b7672ab83a30860
diff --git a/WORKSPACE b/WORKSPACE index 7598813..7264bed 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -32,6 +32,8 @@ workspace(name = "com_google_ceres_solver") +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + # External dependency: Google Flags; has Bazel build already. http_archive( name = "com_github_gflags_gflags", @@ -54,18 +56,29 @@ ) # External dependency: Eigen; has no Bazel build. -new_http_archive( +http_archive( name = "com_github_eigen_eigen", - build_file = "bazel/eigen.BUILD", sha256 = "dd254beb0bafc695d0f62ae1a222ff85b52dbaa3a16f76e781dce22d0d20a4a6", strip_prefix = "eigen-eigen-5a0156e40feb", urls = [ "http://bitbucket.org/eigen/eigen/get/3.3.4.tar.bz2", ], + build_file_content = +""" +# TODO(keir): Replace this with a better version, like from TensorFlow. +# See https://github.com/ceres-solver/ceres-solver/issues/337. +cc_library( + name = 'eigen', + srcs = [], + includes = ['.'], + hdrs = glob(['Eigen/**']), + visibility = ['//visibility:public'], +) +""" ) # External dependency: Google Benchmark; has no Bazel build. -new_http_archive( +http_archive( name = "com_github_google_benchmark", urls = ["https://github.com/google/benchmark/archive/56f52ee228783547f544d9ac4a533574b9010e3f.zip"], sha256 = "8c1c6e90cd320b07504fabb86400f390faff2e599183ebd9396908817968ae79",
diff --git a/bazel/eigen.BUILD b/bazel/eigen.BUILD deleted file mode 100644 index cf6391a..0000000 --- a/bazel/eigen.BUILD +++ /dev/null
@@ -1,39 +0,0 @@ -# Ceres Solver - A fast non-linear least squares minimizer -# Copyright 2018 Google Inc. All rights reserved. -# http://ceres-solver.org/ -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# * Neither the name of Google Inc. nor the names of its contributors may be -# used to endorse or promote products derived from this software without -# specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -# Authors: mierle@gmail.com (Keir Mierle) - -# TODO(keir): Replace this with a better version, like from TensorFlow. -# See https://github.com/ceres-solver/ceres-solver/issues/337. -cc_library( - name = 'eigen', - srcs = [], - includes = ['.'], - hdrs = glob(['Eigen/**']), - visibility = ['//visibility:public'], -)