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

Side by Side Diff: testing/gmock.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 | « remoting/remoting_test.gypi ('k') | testing/gmock_custom/gmock/internal/custom/gmock-port.h » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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': 'gmock', 8 'target_name': 'gmock',
9 'type': 'static_library', 9 'type': 'static_library',
10 'dependencies': [ 10 'dependencies': [
(...skipping 18 matching lines...) Expand all
29 'gmock/src/gmock-internal-utils.cc', 29 'gmock/src/gmock-internal-utils.cc',
30 'gmock/src/gmock-matchers.cc', 30 'gmock/src/gmock-matchers.cc',
31 'gmock/src/gmock-spec-builders.cc', 31 'gmock/src/gmock-spec-builders.cc',
32 'gmock/src/gmock.cc', 32 'gmock/src/gmock.cc',
33 'gmock_mutant.h', # gMock helpers 33 'gmock_mutant.h', # gMock helpers
34 ], 34 ],
35 'sources!': [ 35 'sources!': [
36 'gmock/src/gmock-all.cc', # Not needed by our build. 36 'gmock/src/gmock-all.cc', # Not needed by our build.
37 ], 37 ],
38 'include_dirs': [ 38 'include_dirs': [
39 'gmock', 39 'gmock_custom',
40 'gmock/include', 40 'gmock/include',
41 ], 41 ],
42 'all_dependent_settings': { 42 'all_dependent_settings': {
43 'include_dirs': [ 43 'include_dirs': [
44 'gmock_custom',
44 'gmock/include', # So that gmock headers can find themselves. 45 'gmock/include', # So that gmock headers can find themselves.
45 ], 46 ],
46 }, 47 },
47 'export_dependent_settings': [ 48 'export_dependent_settings': [
48 'gtest.gyp:gtest', 49 'gtest.gyp:gtest',
49 ], 50 ],
50 'conditions': [ 51 'conditions': [
51 ['OS == "ios"', { 52 ['OS == "ios"', {
52 'toolsets': ['host', 'target'], 53 'toolsets': ['host', 'target'],
53 }], 54 }],
54 ], 55 ],
55 }, 56 },
56 { 57 {
57 'target_name': 'gmock_main', 58 'target_name': 'gmock_main',
58 'type': 'static_library', 59 'type': 'static_library',
59 'dependencies': [ 60 'dependencies': [
60 'gmock', 61 'gmock',
61 ], 62 ],
62 'sources': [ 63 'sources': [
63 'gmock/src/gmock_main.cc', 64 'gmock/src/gmock_main.cc',
64 ], 65 ],
65 }, 66 },
66 ], 67 ],
67 } 68 }
OLDNEW
« no previous file with comments | « remoting/remoting_test.gypi ('k') | testing/gmock_custom/gmock/internal/custom/gmock-port.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698