diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-09 14:00:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 14:00:25 -0500 |
| commit | 1df907381de5483def338eff280697e0dafb2b75 (patch) | |
| tree | 411f3fe8945689486edb35084e71fccce1df3907 | |
| parent | 258fd6e16820ea6c3d9a1ccd4c7d7ffc8ec38e40 (diff) | |
| parent | e194f52114a181cb3fb420d58d5ae2250207e828 (diff) | |
| download | googletest-1df907381de5483def338eff280697e0dafb2b75.tar.gz googletest-1df907381de5483def338eff280697e0dafb2b75.tar.bz2 googletest-1df907381de5483def338eff280697e0dafb2b75.zip | |
Merge branch 'master' into master
| -rw-r--r-- | BUILD.bazel | 13 | ||||
| -rw-r--r-- | googlemock/test/BUILD.bazel | 3 | ||||
| -rw-r--r-- | googletest/test/BUILD.bazel | 9 |
3 files changed, 18 insertions, 7 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index 922ce04e..7d2e9d2b 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -37,7 +37,12 @@ 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"}, ) @@ -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", ], diff --git a/googlemock/test/BUILD.bazel b/googlemock/test/BUILD.bazel index 9f1a64d8..4c2df9e2 100644 --- a/googlemock/test/BUILD.bazel +++ b/googlemock/test/BUILD.bazel @@ -45,7 +45,8 @@ cc_test( ], ), linkopts = select({ - "//:win": [], + "//:windows": [], + "//:windows_msvc": [], "//conditions:default": [ "-pthread", ], diff --git a/googletest/test/BUILD.bazel b/googletest/test/BUILD.bazel index 5daa1544..62b88da4 100644 --- a/googletest/test/BUILD.bazel +++ b/googletest/test/BUILD.bazel @@ -57,13 +57,15 @@ cc_test( "gtest-param-test_test.cc", ], ) + select({ - "//:win": [], + "//:windows": [], + "//:windows_msvc": [], "//conditions:default": [ "gtest-tuple_test.cc", ], }), copts = select({ - "//:win": ["-DGTEST_USE_OWN_TR1_TUPLE=0"], + "//:windows": ["-DGTEST_USE_OWN_TR1_TUPLE=0"], + "//:windows_msvc": ["-DGTEST_USE_OWN_TR1_TUPLE=0"], "//conditions:default": ["-DGTEST_USE_OWN_TR1_TUPLE=1"], }), includes = [ @@ -73,7 +75,8 @@ cc_test( "googletest/test", ], linkopts = select({ - "//:win": [], + "//:windows": [], + "//:windows_msvc": [], "//conditions:default": [ "-pthread", ], |