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

Unified Diff: third_party/googletest.gyp

Issue 10234088: Use GYP to generate MSVS project files (Closed)
Patch Set: Created April 23, 2013, 4:24 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« libadblockplus.gyp ('K') | « msvs_makesnapshot_release.bat ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/googletest.gyp
===================================================================
--- a/third_party/googletest.gyp
+++ b/third_party/googletest.gyp
@@ -1,9 +1,16 @@
{
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.
+ 'configurations': {
+ 'Debug': {
+ 'defines': [ 'DEBUG' ],
+ },
+ 'Release': {
+ },
+ },
'targets': [{
'target_name': 'googletest',
'type': '<(library)',
'sources': [
'googletest/src/gtest-death-test.cc',
'googletest/src/gtest-filepath.cc',
'googletest/src/gtest-port.cc',
'googletest/src/gtest-printers.cc',
@@ -11,17 +18,23 @@
'googletest/src/gtest-typed-test.cc',
'googletest/src/gtest.cc'
],
'direct_dependent_settings': {
'include_dirs': [
'googletest',
'googletest/include'
]
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
- }
+ },
+ 'conditions': [[
+ 'OS=="win"',
+ {
+ 'defines': [ '_VARIADIC_MAX=10' ],
+ }
+ ]],
},
{
'target_name': 'googletest_main',
'type': '<(library)',
'sources': ['googletest/src/gtest_main.cc'],
'dependencies': ['googletest'],
'export_dependent_settings': ['googletest']
}]
« libadblockplus.gyp ('K') | « msvs_makesnapshot_release.bat ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld