Update bazel WORKSPACE and BUILD files to work better on Windows. (#581)

Note, bazel only supports MSVC on Windows, and not MinGW, so linking against shlwapi.lib only needs to follow MSVC conventions. git_repository() did not work in local testing, so is swapped for http_archive(). The latter is also documented as the preferred way to depend on an external library in bazel.

Update bazel WORKSPACE and BUILD files to work better on Windows. (#581)
62a9d756 · Alex Strelnikov · Dominic Hamon · b678a202 · 62a9d756 · 62a9d756
Commit 62a9d756 authored May 02, 2018 by Alex Strelnikov Committed by Dominic Hamon May 02, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 9 deletions

BUILD.bazel BUILD.bazel +1 -1

README.md README.md +2 -2

WORKSPACE WORKSPACE +4 -6

No files found.
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -16,7 +16,7 @@ cc_library(
    ]),
    hdrs = ["include/benchmark/benchmark.h"],
    linkopts = select({
-        ":windows": [],
+        ":windows": ["-DEFAULTLIB:shlwapi.lib"],
        "//conditions:default": ["-pthread"],
    }),
    strip_include_prefix = "include",

--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ We need to install the library globally now
 sudo make install
 ```

-Now you have google/benchmark installed in your machine 
+Now you have google/benchmark installed in your machine
 Note: Don't forget to link to pthread library while building

 ## Stable and Experimental Library Versions
@@ -933,7 +933,7 @@ sudo cpupower frequency-set --governor powersave

 # Known Issues

-### Windows
+### Windows with CMake

 * Users must manually link `shlwapi.lib`. Failure to do so may result
 in unresolved symbols.

--- a/WORKSPACE
+++ b/WORKSPACE
 workspace(name = "com_github_google_benchmark")

-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-
-git_repository(
-    name = "com_google_googletest",
-    commit = "3f0cf6b62ad1eb50d8736538363d3580dd640c3e",  # HEAD
-    remote = "https://github.com/google/googletest",
+http_archive(
+     name = "com_google_googletest",
+     urls = ["https://github.com/google/googletest/archive/3f0cf6b62ad1eb50d8736538363d3580dd640c3e.zip"],
+     strip_prefix = "googletest-3f0cf6b62ad1eb50d8736538363d3580dd640c3e",
 )