Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: third_party/googletest.gyp

Issue 10234088: Use GYP to generate MSVS project files (Closed)
Left Patch Set: Created April 23, 2013, 4:24 p.m.
Right Patch Set: Moved project files to build/ Created April 24, 2013, 1:57 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« msvs_gyp_wrapper.py ('K') | « test/WebRequest.cpp ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 { 1 {
Eric 2013/04/23 17:12:17 If we're going to go down the path of altering our
Wladimir Palant 2013/04/24 06:01:34 This file isn't part of googletest, that's why it
Eric 2013/04/24 13:09:44 Ah. Didn't realize that. Never mind.
2 'configurations': { 2 'target_defaults': {
3 'Debug': { 3 'configurations': {
4 'defines': [ 'DEBUG' ], 4 'Debug': {
5 }, 5 'defines': [ 'DEBUG' ],
6 'Release': { 6 'msvs_settings': {
7 'VCCLCompilerTool': {
8 'Optimization': '0',
9
10 'conditions': [
11 ['OS=="win" and component=="shared_library"', {
12 'RuntimeLibrary': '3', # /MDd
13 }, {
14 'RuntimeLibrary': '1', # /MTd
15 }]
16 ],
17 },
18 },
19 },
20 'Release': {
21 'msvs_settings': {
22 'VCCLCompilerTool': {
23 'Optimization': '2',
24 'InlineFunctionExpansion': '2',
25 'EnableIntrinsicFunctions': 'true',
26 'FavorSizeOrSpeed': '0',
27 'StringPooling': 'true',
28
29 'conditions': [
30 ['OS=="win" and component=="shared_library"', {
31 'RuntimeLibrary': '2', # /MD
32 }, {
33 'RuntimeLibrary': '0', # /MT
34 }]
35 ],
36 },
37 },
38 },
7 }, 39 },
8 }, 40 },
9 'targets': [{ 41 'targets': [{
10 'target_name': 'googletest', 42 'target_name': 'googletest',
11 'type': '<(library)', 43 'type': '<(library)',
12 'sources': [ 44 'sources': [
13 'googletest/src/gtest-death-test.cc', 45 'googletest/src/gtest-death-test.cc',
14 'googletest/src/gtest-filepath.cc', 46 'googletest/src/gtest-filepath.cc',
15 'googletest/src/gtest-port.cc', 47 'googletest/src/gtest-port.cc',
16 'googletest/src/gtest-printers.cc', 48 'googletest/src/gtest-printers.cc',
17 'googletest/src/gtest-test-part.cc', 49 'googletest/src/gtest-test-part.cc',
18 'googletest/src/gtest-typed-test.cc', 50 'googletest/src/gtest-typed-test.cc',
19 'googletest/src/gtest.cc' 51 'googletest/src/gtest.cc'
20 ], 52 ],
53 'include_dirs': [
54 'googletest',
55 'googletest/include'
56 ],
21 'direct_dependent_settings': { 57 'direct_dependent_settings': {
22 'include_dirs': [ 58 'include_dirs': [
23 'googletest', 59 'googletest',
24 'googletest/include' 60 'googletest/include'
25 ] 61 ]
Eric 2013/04/23 17:12:17 Does this work to compile our tests correctly? (as
Wladimir Palant 2013/04/24 06:01:34 No, it doesn't - at least not on Windows. I'm stil
26 }, 62 },
27 'conditions': [[ 63 'conditions': [[
28 'OS=="win"', 64 'OS=="win"',
29 { 65 {
30 'defines': [ '_VARIADIC_MAX=10' ], 66 'defines': [ '_VARIADIC_MAX=10' ],
67 'direct_dependent_settings': {
68 'defines': [ '_VARIADIC_MAX=10' ],
69 },
31 } 70 }
32 ]], 71 ]],
33 }, 72 },
34 { 73 {
35 'target_name': 'googletest_main', 74 'target_name': 'googletest_main',
36 'type': '<(library)', 75 'type': '<(library)',
37 'sources': ['googletest/src/gtest_main.cc'], 76 'sources': ['googletest/src/gtest_main.cc'],
38 'dependencies': ['googletest'], 77 'dependencies': ['googletest'],
39 'export_dependent_settings': ['googletest'] 78 'export_dependent_settings': ['googletest']
40 }] 79 }]
41 } 80 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld