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

Side by Side Diff: testing/gtest.gyp

Issue 1981383003: Allow GTest to use C++11 features (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes typo Created 4 years, 7 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 | « 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 'includes': [ 6 'includes': [
7 'gtest.gypi', 7 'gtest.gypi',
8 ], 8 ],
9 'targets': [ 9 'targets': [
10 { 10 {
11 'target_name': 'gtest', 11 'target_name': 'gtest',
12 'toolsets': ['host', 'target'], 12 'toolsets': ['host', 'target'],
13 'type': 'static_library', 13 'type': 'static_library',
14 'sources': [ 14 'sources': [
15 '<@(gtest_sources)', 15 '<@(gtest_sources)',
16 ], 16 ],
17 'include_dirs': [ 17 'include_dirs': [
18 'gtest', 18 'gtest',
19 'gtest/include', 19 'gtest/include',
20 ], 20 ],
21 'dependencies': [ 21 'dependencies': [
22 'gtest_prod', 22 'gtest_prod',
23 ], 23 ],
24 'defines': [ 24 'defines': [
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 # Chrome doesn't support / require C++11, yet.
29 'GTEST_LANG_CXX11=0',
30 ], 28 ],
31 'all_dependent_settings': { 29 'all_dependent_settings': {
32 'defines': [ 30 'defines': [
33 'GTEST_HAS_POSIX_RE=0', 31 'GTEST_HAS_POSIX_RE=0',
34 'GTEST_LANG_CXX11=0',
35 ], 32 ],
36 }, 33 },
37 'conditions': [ 34 'conditions': [
35 ['OS == "chromeos"', {
36 'defines': [
37 # ChromeOS uses libstd++4.6, which has an outdated <type_traits>
38 # header that lacks traits required by GTest in C++11 mode.
39 'GTEST_LANG_CXX11=0',
40 ],
41 'direct_dependency_settings': {
42 'defines': [
43 'GTEST_LANG_CXX11=0',
44 ],
45 },
46 }],
38 ['OS == "mac" or OS == "ios"', { 47 ['OS == "mac" or OS == "ios"', {
39 'sources': [ 48 'sources': [
40 'gtest_mac.h', 49 'gtest_mac.h',
41 'gtest_mac.mm', 50 'gtest_mac.mm',
42 'platform_test_mac.mm', 51 'platform_test_mac.mm',
43 ], 52 ],
44 'link_settings': { 53 'link_settings': {
45 'libraries': [ 54 'libraries': [
46 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 55 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
47 ], 56 ],
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 { 222 {
214 'target_name': 'gtest_prod', 223 'target_name': 'gtest_prod',
215 'toolsets': ['host', 'target'], 224 'toolsets': ['host', 'target'],
216 'type': 'none', 225 'type': 'none',
217 'sources': [ 226 'sources': [
218 'gtest/include/gtest/gtest_prod.h', 227 'gtest/include/gtest/gtest_prod.h',
219 ], 228 ],
220 }, 229 },
221 ], 230 ],
222 } 231 }
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