From 9538687a89b456e8b4339d7b7928e951ec928198 Mon Sep 17 00:00:00 2001 From: Zhongming Qu Date: Tue, 4 Jul 2017 17:50:00 -0400 Subject: Remove trailing whitespaces in BUILD.bazel --- BUILD.bazel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'BUILD.bazel') diff --git a/BUILD.bazel b/BUILD.bazel index a4423740..5a193fac 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,4 +1,4 @@ -# Copyright 2017 Google Inc. +# Copyright 2017 Google Inc. # All Rights Reserved. # # @@ -41,7 +41,7 @@ config_setting( values = {"cpu": "x64_windows_msvc"}, ) -# Google Test including Google Mock +# Google Test including Google Mock cc_library( name = "gtest", srcs = glob( -- cgit v1.2.3 From 99d0ef39a6673b193150399ff69cc1ec78b4b6c7 Mon Sep 17 00:00:00 2001 From: Zhongming Qu Date: Fri, 18 Aug 2017 03:59:05 -0700 Subject: Also can build when included in source. --- BUILD.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'BUILD.bazel') diff --git a/BUILD.bazel b/BUILD.bazel index 5a193fac..922ce04e 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -88,7 +88,7 @@ cc_library( srcs = [ "googlemock/src/gmock_main.cc", ], - deps = ["//:gtest"], + deps = [":gtest"], ) # The following rules build samples of how to use gTest. -- cgit v1.2.3 From cbd15d417e9a9b8dfbac4483d49b4e0c6664b940 Mon Sep 17 00:00:00 2001 From: Loo Rong Jie Date: Sun, 7 Jan 2018 22:52:52 +0800 Subject: [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc and x64_windows_msvc --- BUILD.bazel | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'BUILD.bazel') 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", ], -- cgit v1.2.3