diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-08-01 21:48:05 (GMT) |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-08-01 21:48:05 (GMT) |
| commit | 1cd979a80701a6c8c370f3a69048ba5cbec62a28 (patch) | |
| tree | 5358fa1f0e6726c0b9a77b985d26f7b431b663b9 /BUILD.bazel | |
| parent | 3280099951c51b7d2745bd840f2dd9d967cffcda (diff) | |
| parent | e5e2ef7cd27cc089c1d8302a11970ef870554294 (diff) | |
| download | googletest-1cd979a80701a6c8c370f3a69048ba5cbec62a28.zip googletest-1cd979a80701a6c8c370f3a69048ba5cbec62a28.tar.gz googletest-1cd979a80701a6c8c370f3a69048ba5cbec62a28.tar.bz2 | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'BUILD.bazel')
| -rw-r--r-- | BUILD.bazel | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index 6d82829..41a0985 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -38,7 +38,7 @@ licenses(["notice"]) config_setting( name = "windows", - values = { "cpu": "x64_windows" }, + values = {"cpu": "x64_windows"}, ) config_setting( @@ -51,7 +51,6 @@ config_setting( values = {"define": "absl=1"}, ) - # Google Test including Google Mock cc_library( name = "gtest", @@ -70,7 +69,7 @@ cc_library( "googlemock/src/gmock_main.cc", ], ), - hdrs =glob([ + hdrs = glob([ "googletest/include/gtest/*.h", "googlemock/include/gmock/*.h", ]), @@ -81,6 +80,14 @@ cc_library( "//conditions:default": ["-pthread"], }, ), + defines = select( + { + ":has_absl": [ + "GTEST_HAS_ABSL=1", + ], + "//conditions:default": [], + }, + ), includes = [ "googlemock", "googlemock/include", @@ -94,21 +101,19 @@ cc_library( "-pthread", ], }), - defines = select ({ - ":has_absl": [ - "GTEST_HAS_ABSL=1", - ], - "//conditions:default": [], - } + deps = select( + { + ":has_absl": [ + "@com_google_absl//absl/debugging:failure_signal_handler", + "@com_google_absl//absl/debugging:stacktrace", + "@com_google_absl//absl/debugging:symbolize", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/types:optional", + "@com_google_absl//absl/types:variant", + ], + "//conditions:default": [], + }, ), - deps = select ({ - ":has_absl": [ - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/strings" - ], - "//conditions:default": [], - } - ) ) cc_library( |