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

Side by Side Diff: testing/gtest_nacl.gyp

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: rebase 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 | « testing/gtest.gyp ('k') | ui/events/events_unittests.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/common_untrusted.gypi', 10 '../build/common_untrusted.gypi',
(...skipping 18 matching lines...) Expand all
29 ], 29 ],
30 'include_dirs': [ 30 'include_dirs': [
31 'gtest', 31 'gtest',
32 'gtest/include', 32 'gtest/include',
33 ], 33 ],
34 'defines': [ 34 'defines': [
35 # In order to allow regex matches in gtest to be shared between 35 # In order to allow regex matches in gtest to be shared between
36 # Windows and other systems, we tell gtest to always use it's 36 # Windows and other systems, we tell gtest to always use it's
37 # internal engine. 37 # internal engine.
38 'GTEST_HAS_POSIX_RE=0', 38 'GTEST_HAS_POSIX_RE=0',
39 'GTEST_LANG_CXX11=0',
40 # gtest isn't able to figure out when RTTI is disabled for gcc
41 # versions older than 4.3.2, and assumes it's enabled. Our Mac
42 # and Linux builds disable RTTI, and cannot guarantee that the
43 # compiler will be 4.3.2. or newer. The Mac, for example, uses
44 # 4.2.1 as that is the latest available on that platform. gtest
45 # must be instructed that RTTI is disabled here, and for any
46 # direct dependents that might include gtest headers.
47 'GTEST_HAS_RTTI=0',
48 ], 39 ],
49 'all_dependent_settings': { 40 'all_dependent_settings': {
50 'defines': [ 41 'defines': [
51 'GTEST_HAS_POSIX_RE=0', 42 'GTEST_HAS_POSIX_RE=0',
52 'GTEST_LANG_CXX11=0',
53 ], 43 ],
54 'link_flags': [ 44 'link_flags': [
55 '-lgtest_nacl', 45 '-lgtest_nacl',
56 ], 46 ],
57 }, 47 },
58 'direct_dependent_settings': { 48 'direct_dependent_settings': {
59 'defines': [ 49 'defines': [
60 'UNIT_TEST', 50 'UNIT_TEST',
61 'GTEST_HAS_RTTI=0',
62 ], 51 ],
63 'include_dirs': [ 52 'include_dirs': [
64 'gtest/include', # So that gtest headers can find themselves. 53 'gtest/include', # So that gtest headers can find themselves.
65 ], 54 ],
66 }, 55 },
67 }, 56 },
68 { 57 {
69 'target_name': 'gtest_main_nacl', 58 'target_name': 'gtest_main_nacl',
70 'type': 'none', 59 'type': 'none',
71 'variables': { 60 'variables': {
(...skipping 13 matching lines...) Expand all
85 'all_dependent_settings': { 74 'all_dependent_settings': {
86 'link_flags': [ 75 'link_flags': [
87 '-lgtest_main_nacl', 76 '-lgtest_main_nacl',
88 ], 77 ],
89 }, 78 },
90 }, 79 },
91 ], 80 ],
92 }], 81 }],
93 ], 82 ],
94 } 83 }
OLDNEW
« no previous file with comments | « testing/gtest.gyp ('k') | ui/events/events_unittests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698