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

Side by Side Diff: testing/gtest.gyp

Issue 11088033: fix for compilation of gtest on VS2012 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 (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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'gtest', 8 'target_name': 'gtest',
9 'type': 'static_library', 9 'type': 'static_library',
10 'sources': [ 10 'sources': [
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 ['OS=="android" and android_app_abi=="x86"', { 114 ['OS=="android" and android_app_abi=="x86"', {
115 'defines': [ 115 'defines': [
116 'GTEST_HAS_CLONE=0', 116 'GTEST_HAS_CLONE=0',
117 ], 117 ],
118 'direct_dependent_settings': { 118 'direct_dependent_settings': {
119 'defines': [ 119 'defines': [
120 'GTEST_HAS_CLONE=0', 120 'GTEST_HAS_CLONE=0',
121 ], 121 ],
122 }, 122 },
123 }], 123 }],
124 ['OS=="android" or (OS=="win" and MSVS_VERSION=="2012")', { 124 ['OS=="android"', {
scottmg 2012/10/09 18:14:06 this was a previous attempt at a fix, but it only
125 # We want gtest features that use tr1::tuple, but we currently 125 # We want gtest features that use tr1::tuple, but we currently
126 # don't support the variadic templates used by libstdc++'s 126 # don't support the variadic templates used by libstdc++'s
127 # implementation. gtest supports this scenario by providing its 127 # implementation. gtest supports this scenario by providing its
128 # own implementation but we must opt in to it. 128 # own implementation but we must opt in to it.
129 'defines': [ 129 'defines': [
130 'GTEST_USE_OWN_TR1_TUPLE=1', 130 'GTEST_USE_OWN_TR1_TUPLE=1',
131 ], 131 ],
132 'direct_dependent_settings': { 132 'direct_dependent_settings': {
133 'defines': [ 133 'defines': [
134 'GTEST_USE_OWN_TR1_TUPLE=1', 134 'GTEST_USE_OWN_TR1_TUPLE=1',
135 ], 135 ],
136 }, 136 },
137 }], 137 }],
138 ['OS=="win" and MSVS_VERSION=="2012"', {
139 'defines': [
140 '_VARIADIC_MAX=10',
141 ],
142 'direct_dependent_settings': {
143 'defines': [
144 '_VARIADIC_MAX=10',
145 ],
146 },
147 }],
138 ], 148 ],
139 'direct_dependent_settings': { 149 'direct_dependent_settings': {
140 'defines': [ 150 'defines': [
141 'UNIT_TEST', 151 'UNIT_TEST',
142 ], 152 ],
143 'include_dirs': [ 153 'include_dirs': [
144 'gtest/include', # So that gtest headers can find themselves. 154 'gtest/include', # So that gtest headers can find themselves.
145 ], 155 ],
146 'target_conditions': [ 156 'target_conditions': [
147 ['_type=="executable"', { 157 ['_type=="executable"', {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 { 197 {
188 'target_name': 'gtest_prod', 198 'target_name': 'gtest_prod',
189 'toolsets': ['host', 'target'], 199 'toolsets': ['host', 'target'],
190 'type': 'none', 200 'type': 'none',
191 'sources': [ 201 'sources': [
192 'gtest/include/gtest/gtest_prod.h', 202 'gtest/include/gtest/gtest_prod.h',
193 ], 203 ],
194 }, 204 },
195 ], 205 ],
196 } 206 }
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