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

Side by Side Diff: testing/gtest.gyp

Issue 448053002: Apply patch from https://codereview.chromium.org/425333002 to gtest.gyp. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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 2014 the V8 project authors. All rights reserved. 1 # Copyright 2014 the V8 project 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'gtest', 8 'target_name': 'gtest',
9 'toolsets': ['host', 'target'], 9 'toolsets': ['host', 'target'],
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 'gtest', 45 'gtest',
46 'gtest/include', 46 'gtest/include',
47 ], 47 ],
48 'dependencies': [ 48 'dependencies': [
49 'gtest_prod', 49 'gtest_prod',
50 ], 50 ],
51 'defines': [ 51 'defines': [
52 # In order to allow regex matches in gtest to be shared between Windows 52 # In order to allow regex matches in gtest to be shared between Windows
53 # and other systems, we tell gtest to always use it's internal engine. 53 # and other systems, we tell gtest to always use it's internal engine.
54 'GTEST_HAS_POSIX_RE=0', 54 'GTEST_HAS_POSIX_RE=0',
55 # Chrome doesn't support / require C++11, yet.
56 'GTEST_LANG_CXX11=0',
55 ], 57 ],
56 'all_dependent_settings': { 58 'all_dependent_settings': {
57 'defines': [ 59 'defines': [
58 'GTEST_HAS_POSIX_RE=0', 60 'GTEST_HAS_POSIX_RE=0',
61 'GTEST_LANG_CXX11=0',
59 ], 62 ],
60 }, 63 },
61 'conditions': [ 64 'conditions': [
62 ['os_posix == 1', { 65 ['os_posix == 1', {
63 'defines': [ 66 'defines': [
64 # gtest isn't able to figure out when RTTI is disabled for gcc 67 # gtest isn't able to figure out when RTTI is disabled for gcc
65 # versions older than 4.3.2, and assumes it's enabled. Our Mac 68 # versions older than 4.3.2, and assumes it's enabled. Our Mac
66 # and Linux builds disable RTTI, and cannot guarantee that the 69 # and Linux builds disable RTTI, and cannot guarantee that the
67 # compiler will be 4.3.2. or newer. The Mac, for example, uses 70 # compiler will be 4.3.2. or newer. The Mac, for example, uses
68 # 4.2.1 as that is the latest available on that platform. gtest 71 # 4.2.1 as that is the latest available on that platform. gtest
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 { 149 {
147 'target_name': 'gtest_prod', 150 'target_name': 'gtest_prod',
148 'toolsets': ['host', 'target'], 151 'toolsets': ['host', 'target'],
149 'type': 'none', 152 'type': 'none',
150 'sources': [ 153 'sources': [
151 'gtest/include/gtest/gtest_prod.h', 154 'gtest/include/gtest/gtest_prod.h',
152 ], 155 ],
153 }, 156 },
154 ], 157 ],
155 } 158 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698