diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-09 00:22:32 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-09 00:22:32 -0500 |
commit | 0e6da4cead72ab739171bbe98570da971c3283b6 (patch) | |
tree | 99a678b6b6fe1c8bc76e14287a9b7026c03019b7 /BUILD.bazel | |
parent | cdedd189b22a6578e935256294175b9884e3cf17 (diff) | |
parent | e194f52114a181cb3fb420d58d5ae2250207e828 (diff) | |
download | googletest-0e6da4cead72ab739171bbe98570da971c3283b6.tar.gz googletest-0e6da4cead72ab739171bbe98570da971c3283b6.tar.bz2 googletest-0e6da4cead72ab739171bbe98570da971c3283b6.zip |
Merge branch 'master' into fix-core-dump-shared
Diffstat (limited to 'BUILD.bazel')
-rw-r--r-- | BUILD.bazel | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index a4423740..7d2e9d2b 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,4 +1,4 @@ -# Copyright 2017 Google Inc. +# Copyright 2017 Google Inc. # All Rights Reserved. # # @@ -37,11 +37,16 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) config_setting( - name = "win", + name = "windows", + values = { "cpu": "x64_windows" }, +) + +config_setting( + name = "windows_msvc", values = {"cpu": "x64_windows_msvc"}, ) -# Google Test including Google Mock +# Google Test including Google Mock cc_library( name = "gtest", srcs = glob( @@ -65,7 +70,8 @@ cc_library( ]), copts = select( { - ":win": [], + ":windows": [], + ":windows_msvc": [], "//conditions:default": ["-pthread"], }, ), @@ -76,7 +82,8 @@ cc_library( "googletest/include", ], linkopts = select({ - ":win": [], + ":windows": [], + ":windows_msvc": [], "//conditions:default": [ "-pthread", ], @@ -88,7 +95,7 @@ cc_library( srcs = [ "googlemock/src/gmock_main.cc", ], - deps = ["//:gtest"], + deps = [":gtest"], ) # The following rules build samples of how to use gTest. |