diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-08 22:07:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-08 22:07:26 -0500 |
| commit | e194f52114a181cb3fb420d58d5ae2250207e828 (patch) | |
| tree | 5b06d821076e7013cb62593fb22270916292ba3a /googletest/test | |
| parent | c3bb0ee2a63279a803aaad956b9b26d74bf9e6e2 (diff) | |
| parent | cbd15d417e9a9b8dfbac4483d49b4e0c6664b940 (diff) | |
| download | googletest-e194f52114a181cb3fb420d58d5ae2250207e828.tar.gz googletest-e194f52114a181cb3fb420d58d5ae2250207e828.tar.bz2 googletest-e194f52114a181cb3fb420d58d5ae2250207e828.zip | |
Merge pull request #1388 from rongjiecomputer/bazel
[Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/BUILD.bazel | 9 |
1 files changed, 6 insertions, 3 deletions
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", ], |