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

Side by Side Diff: testing/gtest.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/gmock_custom/gmock/internal/custom/gmock-port.h ('k') | testing/gtest_nacl.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 (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 'include_dirs': [ 30 'include_dirs': [
33 'gtest/include', 31 'gtest/include',
34 ], 32 ],
35 'defines': [ 33 'defines': [
36 'GTEST_HAS_POSIX_RE=0', 34 'GTEST_HAS_POSIX_RE=0',
37 'GTEST_LANG_CXX11=0',
38 ], 35 ],
39 }, 36 },
40 'conditions': [ 37 'conditions': [
41 ['OS == "mac" or OS == "ios"', { 38 ['OS == "mac" or OS == "ios"', {
42 'sources': [ 39 'sources': [
43 'gtest_mac.h', 40 'gtest_mac.h',
44 'gtest_mac.mm', 41 'gtest_mac.mm',
45 'platform_test_mac.mm', 42 'platform_test_mac.mm',
46 ], 43 ],
47 'link_settings': { 44 'link_settings': {
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 { 165 {
169 'target_name': 'gtest_prod', 166 'target_name': 'gtest_prod',
170 'toolsets': ['host', 'target'], 167 'toolsets': ['host', 'target'],
171 'type': 'none', 168 'type': 'none',
172 'sources': [ 169 'sources': [
173 'gtest/include/gtest/gtest_prod.h', 170 'gtest/include/gtest/gtest_prod.h',
174 ], 171 ],
175 }, 172 },
176 ], 173 ],
177 } 174 }
OLDNEW
« no previous file with comments | « testing/gmock_custom/gmock/internal/custom/gmock-port.h ('k') | testing/gtest_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698