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

Side by Side Diff: testing/gtest.gyp

Issue 2174213002: Specify GTEST_LANG_CXX11 to 1 explicitly rather than let gtest detect it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « build/secondary/testing/gtest/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'includes': [ 6 'includes': [
7 'gtest.gypi', 7 'gtest.gypi',
8 ], 8 ],
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 14 matching lines...) Expand all
25 # In order to allow regex matches in gtest to be shared between Windows 25 # In order to allow regex matches in gtest to be shared between Windows
26 # and other systems, we tell gtest to always use it's internal engine. 26 # and other systems, we tell gtest to always use it's internal engine.
27 'GTEST_HAS_POSIX_RE=0', 27 'GTEST_HAS_POSIX_RE=0',
28 ], 28 ],
29 'all_dependent_settings': { 29 'all_dependent_settings': {
30 'include_dirs': [ 30 'include_dirs': [
31 'gtest/include', 31 'gtest/include',
32 ], 32 ],
33 'defines': [ 33 'defines': [
34 'GTEST_HAS_POSIX_RE=0', 34 'GTEST_HAS_POSIX_RE=0',
35 'GTEST_LANG_CXX11=1',
35 ], 36 ],
36 }, 37 },
37 'conditions': [ 38 'conditions': [
38 ['OS == "mac" or OS == "ios"', { 39 ['OS == "mac" or OS == "ios"', {
39 'sources': [ 40 'sources': [
40 'gtest_mac.h', 41 'gtest_mac.h',
41 'gtest_mac.mm', 42 'gtest_mac.mm',
42 'platform_test_mac.mm', 43 'platform_test_mac.mm',
43 ], 44 ],
44 'link_settings': { 45 'link_settings': {
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 { 166 {
166 'target_name': 'gtest_prod', 167 'target_name': 'gtest_prod',
167 'toolsets': ['host', 'target'], 168 'toolsets': ['host', 'target'],
168 'type': 'none', 169 'type': 'none',
169 'sources': [ 170 'sources': [
170 'gtest/include/gtest/gtest_prod.h', 171 'gtest/include/gtest/gtest_prod.h',
171 ], 172 ],
172 }, 173 },
173 ], 174 ],
174 } 175 }
OLDNEW
« no previous file with comments | « build/secondary/testing/gtest/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698