Skip to content

Commit

Permalink
Merge pull request #50 from gennadiycivil/master
Browse files Browse the repository at this point in the history
Switch to googletest provided bazel build files
  • Loading branch information
devjgm authored Aug 11, 2017
2 parents bd0f906 + 8f71aaa commit f2bdef9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 33 deletions.
6 changes: 3 additions & 3 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ cc_test(
srcs = ["src/civil_time_test.cc"],
deps = [
":civil_time",
"@gtest//:gtest",
"@com_google_googletest//:gtest_main",
],
)

Expand All @@ -74,7 +74,7 @@ cc_test(
deps = [
":civil_time",
":time_zone",
"@gtest//:gtest",
"@com_google_googletest//:gtest_main",
],
)

Expand All @@ -85,7 +85,7 @@ cc_test(
deps = [
":civil_time",
":time_zone",
"@gtest//:gtest",
"@com_google_googletest//:gtest_main",
],
)

Expand Down
36 changes: 6 additions & 30 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,33 +1,9 @@
new_git_repository(
name = "gtest",
remote = "https://github.com/google/googletest.git",
commit = "de411c3e80120f8dcc2a3f4f62f3ca692c0431d7",
build_file_content =
"""
cc_library(
name = "gtest",
srcs = glob(
[
"google*/src/*.cc",
],
exclude = glob([
"google*/src/*-all.cc",
"googlemock/src/gmock_main.cc",
]),
),
hdrs = glob(["*/include/**/*.h"]),
includes = [
"googlemock/",
"googlemock/include",
"googletest/",
"googletest/include",
],
linkopts = ["-pthread"],
textual_hdrs = ["googletest/src/gtest-internal-inl.h"],
visibility = ["//visibility:public"],
)
"""
)
# GoogleTest/GoogleMock framework. Used by most unit-tests.
http_archive(
name = "com_google_googletest",
urls = ["https://github.com/google/googletest/archive/master.zip"],
strip_prefix = "googletest-master",
)

new_git_repository(
name = "benchmark",
Expand Down

0 comments on commit f2bdef9

Please sign in to comment.