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

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

Issue 2174663002: Remove GTEST_LANG_CXX11 and switch to C++11 on gtest and gmock (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: +gyp Created 4 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 import("//build_overrides/gtest.gni") 5 import("//build_overrides/gtest.gni")
6 6
7 config("gtest_config") { 7 config("gtest_config") {
8 visibility = [ 8 visibility = [
9 ":*", 9 ":*",
10 "//testing/gmock:*", # gmock also shares this config. 10 "//testing/gmock:*", # gmock also shares this config.
11 ] 11 ]
12 12
13 defines = [ 13 defines = [
14 # In order to allow regex matches in gtest to be shared between Windows 14 # In order to allow regex matches in gtest to be shared between Windows
15 # and other systems, we tell gtest to always use it's internal engine. 15 # and other systems, we tell gtest to always use it's internal engine.
16 "GTEST_HAS_POSIX_RE=0", 16 "GTEST_HAS_POSIX_RE=0",
17
18 # Chrome doesn't support / require C++11, yet.
19 "GTEST_LANG_CXX11=0",
20 ] 17 ]
21 18
22 # Gtest headers need to be able to find themselves. 19 # Gtest headers need to be able to find themselves.
23 include_dirs = [ "include" ] 20 include_dirs = [ "include" ]
24 21
25 if (is_win) { 22 if (is_win) {
26 cflags = [ "/wd4800" ] # Unused variable warning. 23 cflags = [ "/wd4800" ] # Unused variable warning.
27 } 24 }
28 } 25 }
29 26
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 120
124 source_set("gtest_main") { 121 source_set("gtest_main") {
125 testonly = true 122 testonly = true
126 sources = [ 123 sources = [
127 "src/gtest_main.cc", 124 "src/gtest_main.cc",
128 ] 125 ]
129 deps = [ 126 deps = [
130 ":gtest", 127 ":gtest",
131 ] 128 ]
132 } 129 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698