Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Side by Side Diff: build/secondary/testing/gtest/BUILD.gn

Issue 1210013007: clang/win: Fix warnings to prepare for building without -Wno-reorder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@clang-unsequenced
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 config("gtest_config") { 5 config("gtest_config") {
6 visibility = [ 6 visibility = [
7 ":*", 7 ":*",
8 "//testing/gmock:*", # gmock also shares this config. 8 "//testing/gmock:*", # gmock also shares this config.
9 ] 9 ]
10 10
11 defines = [ 11 defines = [
12 # In order to allow regex matches in gtest to be shared between Windows 12 # In order to allow regex matches in gtest to be shared between Windows
13 # and other systems, we tell gtest to always use it's internal engine. 13 # and other systems, we tell gtest to always use it's internal engine.
14 "GTEST_HAS_POSIX_RE=0", 14 "GTEST_HAS_POSIX_RE=0",
15 15
16 # Chrome doesn't support / require C++11, yet. 16 # Chrome doesn't support / require C++11, yet.
17 "GTEST_LANG_CXX11=0", 17 "GTEST_LANG_CXX11=0",
18 ] 18 ]
19 19
20 # Gtest headers need to be able to find themselves. 20 # Gtest headers need to be able to find themselves.
21 include_dirs = [ "include" ] 21 include_dirs = [ "include" ]
22 22
23 if (is_win) { 23 if (is_win) {
24 cflags = [ "/wd4800" ] # Unused variable warning. 24 cflags = [ "/wd4800" ] # Unused variable warning.
25 if (is_clang) {
26 # The Mutex constructor initializer list in gtest-port.cc is incorrectly
27 # ordered.
Nico 2015/06/30 18:03:50 Can you file an upstream bug for this?
Sam McNally 2015/07/02 00:12:13 Done.
28 cflags += [ "-Wno-reorder" ]
29 }
25 } 30 }
26 31
27 if (is_posix) { 32 if (is_posix) {
28 defines += [ 33 defines += [
29 # gtest isn't able to figure out when RTTI is disabled for gcc 34 # gtest isn't able to figure out when RTTI is disabled for gcc
30 # versions older than 4.3.2, and assumes it's enabled. Our Mac 35 # versions older than 4.3.2, and assumes it's enabled. Our Mac
31 # and Linux builds disable RTTI, and cannot guarantee that the 36 # and Linux builds disable RTTI, and cannot guarantee that the
32 # compiler will be 4.3.2. or newer. The Mac, for example, uses 37 # compiler will be 4.3.2. or newer. The Mac, for example, uses
33 # 4.2.1 as that is the latest available on that platform. gtest 38 # 4.2.1 as that is the latest available on that platform. gtest
34 # must be instructed that RTTI is disabled here, and for any 39 # must be instructed that RTTI is disabled here, and for any
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 source_set("gtest_main") { 121 source_set("gtest_main") {
117 # TODO http://crbug.com/412064 enable this flag all the time. 122 # TODO http://crbug.com/412064 enable this flag all the time.
118 testonly = !is_component_build 123 testonly = !is_component_build
119 sources = [ 124 sources = [
120 "src/gtest_main.cc", 125 "src/gtest_main.cc",
121 ] 126 ]
122 deps = [ 127 deps = [
123 ":gtest", 128 ":gtest",
124 ] 129 ]
125 } 130 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698