diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-12 15:51:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-12 15:51:13 -0400 |
| commit | df0d0a3f33bb29b0b303e4def78a8629a56fff80 (patch) | |
| tree | 4b73b4e6ed35633bb67b8bbd4e6f78fb1d248eb9 /BUILD.bazel | |
| parent | 41f0e24335d8874cc87420a6349bb1844e2a15de (diff) | |
| parent | 6c7878a151f05d64f675b800b054c5fc43f3dd6d (diff) | |
| download | googletest-git-df0d0a3f33bb29b0b303e4def78a8629a56fff80.tar.gz | |
Merge pull request #1662 from derekmauro/variant
Adds the UniversalPrinter for absl::variant.
Diffstat (limited to 'BUILD.bazel')
| -rw-r--r-- | BUILD.bazel | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index 6d828294..f6dccd38 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,16 @@ cc_library( "-pthread", ], }), - defines = select ({ - ":has_absl": [ - "GTEST_HAS_ABSL=1", - ], - "//conditions:default": [], - } + deps = select( + { + ":has_absl": [ + "@com_google_absl//absl/types:optional", + "@com_google_absl//absl/types:variant", + "@com_google_absl//absl/strings", + ], + "//conditions:default": [], + }, ), - deps = select ({ - ":has_absl": [ - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/strings" - ], - "//conditions:default": [], - } - ) ) cc_library( |