提交 6a989170 编写于 作者: Y Yi Wang

Fix all building errors

上级 f9f2741f
...@@ -8,26 +8,25 @@ http_archive( ...@@ -8,26 +8,25 @@ http_archive(
# External dependency to gtest 1.7.0. This method comes from # External dependency to gtest 1.7.0. This method comes from
# https://www.bazel.io/versions/master/docs/tutorial/cpp.html. # https://www.bazel.io/versions/master/docs/tutorial/cpp.html.
new_http_archive( new_http_archive(
name = "gtest", name="gtest",
url = "https://github.com/google/googletest/archive/release-1.7.0.zip", url="https://github.com/google/googletest/archive/release-1.7.0.zip",
sha256 = "b58cb7547a28b2c718d1e38aee18a3659c9e3ff52440297e965f5edffe34b6d0", sha256="b58cb7547a28b2c718d1e38aee18a3659c9e3ff52440297e965f5edffe34b6d0",
build_file = "third_party/gtest.BUILD", build_file="third_party/gtest.BUILD",
strip_prefix = "googletest-release-1.7.0", strip_prefix="googletest-release-1.7.0", )
)
# External dependency to gflags. This method comes from # External dependency to gflags. This method comes from
# https://github.com/gflags/example/blob/master/WORKSPACE. # https://github.com/gflags/example/blob/master/WORKSPACE.
git_repository( new_git_repository(
name = "gflags", name="gflags",
tag = "v2.2.0", tag="v2.2.0",
remote = "https://github.com/gflags/gflags.git" remote="https://github.com/gflags/gflags.git",
build_file="third_party/gflags.BUILD",
) )
# External dependency to glog. This method comes from # External dependency to glog. This method comes from
# https://github.com/reyoung/bazel_playground/blob/master/WORKSPACE # https://github.com/reyoung/bazel_playground/blob/master/WORKSPACE
new_git_repository( new_git_repository(
name = "glog", name="glog",
remote = "https://github.com/google/glog.git", remote="https://github.com/google/glog.git",
commit = "b6a5e0524c28178985f0d228e9eaa43808dbec3c", commit="b6a5e0524c28178985f0d228e9eaa43808dbec3c",
build_file = "third_party/glog.BUILD" build_file="third_party/glog.BUILD")
)
# Bazel (http://bazel.io/) BUILD file for gflags.
#
# See INSTALL.md for instructions for adding gflags to a Bazel workspace.
licenses(["notice"])
exports_files(["src/gflags_complections.sh", "COPYING.txt"])
load(":bazel/gflags.bzl", "gflags_sources", "gflags_library")
(hdrs, srcs) = gflags_sources(namespace=["google", "gflags"])
gflags_library(hdrs=hdrs, srcs=srcs, threads=0)
gflags_library(hdrs=hdrs, srcs=srcs, threads=1)
...@@ -3,10 +3,6 @@ licenses(["notice"]) ...@@ -3,10 +3,6 @@ licenses(["notice"])
cc_library( cc_library(
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
name = "glog", name = "glog",
deps = [
#"//third_party/libunwind:libunwind-k8",
"@gflags//:gflags",
],
includes = [ includes = [
".", ".",
"src", "src",
...@@ -24,9 +20,6 @@ cc_library( ...@@ -24,9 +20,6 @@ cc_library(
"-DHAVE_INTTYPES_H", "-DHAVE_INTTYPES_H",
"-DHAVE_LIBPTHREAD", "-DHAVE_LIBPTHREAD",
"-DHAVE_SYS_SYSCALL_H", "-DHAVE_SYS_SYSCALL_H",
#"-DHAVE_LIBUNWIND_H",
"-DHAVE_LIB_GFLAGS",
#"-DHAVE_LIB_UNWIND",
"-DHAVE_MEMORY_H", "-DHAVE_MEMORY_H",
"-DHAVE_NAMESPACES", "-DHAVE_NAMESPACES",
"-DHAVE_PREAD", "-DHAVE_PREAD",
...@@ -51,7 +44,6 @@ cc_library( ...@@ -51,7 +44,6 @@ cc_library(
#"-fno-sanitize=thread", #"-fno-sanitize=thread",
#"-fno-sanitize=address", #"-fno-sanitize=address",
"-Iexternal/glog/src", "-Iexternal/glog/src",
#"-I/usr/local/include", # XXX import libunwind
], ],
srcs = [ srcs = [
"src/demangle.cc", "src/demangle.cc",
...@@ -71,7 +63,6 @@ cc_library( ...@@ -71,7 +63,6 @@ cc_library(
"src/demangle.h", "src/demangle.h",
"src/mock-log.h", "src/mock-log.h",
"src/stacktrace.h", "src/stacktrace.h",
#"src/stacktrace_libunwind-inl.h",
"src/symbolize.h", "src/symbolize.h",
"src/utilities.h", "src/utilities.h",
"src/base/commandlineflags.h", "src/base/commandlineflags.h",
...@@ -79,10 +70,6 @@ cc_library( ...@@ -79,10 +70,6 @@ cc_library(
"src/base/mutex.h", "src/base/mutex.h",
"src/glog/log_severity.h", "src/glog/log_severity.h",
], ],
linkopts = [
#"-pthread",
#"-L/usr/local/lib -lunwind",
],
) )
genrule( genrule(
......
licenses(["notice"]) # Apache 2.0
cc_test(
name = "glog_test",
srcs = ["glog_test.cc"],
copts = ["-Iexternal/gtest/include"],
deps =[
"@gtest//:gtest",
"@glog//:glog",
],
)
#include <iostream>
#include <string>
#include "glog/logging.h"
#include "gtest/gtest.h"
TEST(GlogTest, Logging) {
LOG(INFO) << "Hello world";
}
...@@ -15,10 +15,10 @@ cc_library( ...@@ -15,10 +15,10 @@ cc_library(
deps=[":example_proto"], ) deps=[":example_proto"], )
cc_test( cc_test(
name = "example_lib_test", name="example_lib_test",
srcs = ["example_lib_test.cc"], srcs=["example_lib_test.cc"],
copts = ["-Iexternal/gtest/include"], copts=["-Iexternal/gtest/include"],
deps =[ deps=[
"@gtest//:gtest", "@gtest//:gtest",
":example_lib", ":example_lib",
], ) ], )
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册