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

Side by Side Diff: testing/gtest.gyp

Issue 1210013007: clang/win: Fix warnings to prepare for building without -Wno-reorder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@clang-unsequenced
Patch Set: Created 5 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 (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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 ['OS=="win"', { 184 ['OS=="win"', {
185 'run_as': { 185 'run_as': {
186 'action????': ['$(TargetPath)', '--gtest_print_time'], 186 'action????': ['$(TargetPath)', '--gtest_print_time'],
187 }, 187 },
188 }], 188 }],
189 ], 189 ],
190 }], 190 }],
191 ], 191 ],
192 'msvs_disabled_warnings': [4800], 192 'msvs_disabled_warnings': [4800],
193 }, 193 },
194 'variables': {
195 'clang_warning_flags': [
196 # The Mutex constructor initializer list in gtest-port.cc is
197 # incorrectly ordered.
Nico 2015/06/30 18:03:50 Can you file an upstream bug for this and link to
Sam McNally 2015/07/02 00:12:13 Done.
198 '-Wno-reorder',
199 ]
200 },
194 }, 201 },
195 { 202 {
196 'target_name': 'gtest_main', 203 'target_name': 'gtest_main',
197 'type': 'static_library', 204 'type': 'static_library',
198 'dependencies': [ 205 'dependencies': [
199 'gtest', 206 'gtest',
200 ], 207 ],
201 'sources': [ 208 'sources': [
202 'gtest/src/gtest_main.cc', 209 'gtest/src/gtest_main.cc',
203 ], 210 ],
204 }, 211 },
205 { 212 {
206 'target_name': 'gtest_prod', 213 'target_name': 'gtest_prod',
207 'toolsets': ['host', 'target'], 214 'toolsets': ['host', 'target'],
208 'type': 'none', 215 'type': 'none',
209 'sources': [ 216 'sources': [
210 'gtest/include/gtest/gtest_prod.h', 217 'gtest/include/gtest/gtest_prod.h',
211 ], 218 ],
212 }, 219 },
213 ], 220 ],
214 } 221 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698