| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| 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': { | |
| 3 'Debug': { | |
| 4 'defines': [ 'DEBUG' ], | |
| 5 }, | |
| 6 'Release': { | |
| 7 }, | |
| 8 }, | |
| 2 'targets': [{ | 9 'targets': [{ |
| 3 'target_name': 'googletest', | 10 'target_name': 'googletest', |
| 4 'type': '<(library)', | 11 'type': '<(library)', |
| 5 'sources': [ | 12 'sources': [ |
| 6 'googletest/src/gtest-death-test.cc', | 13 'googletest/src/gtest-death-test.cc', |
| 7 'googletest/src/gtest-filepath.cc', | 14 'googletest/src/gtest-filepath.cc', |
| 8 'googletest/src/gtest-port.cc', | 15 'googletest/src/gtest-port.cc', |
| 9 'googletest/src/gtest-printers.cc', | 16 'googletest/src/gtest-printers.cc', |
| 10 'googletest/src/gtest-test-part.cc', | 17 'googletest/src/gtest-test-part.cc', |
| 11 'googletest/src/gtest-typed-test.cc', | 18 'googletest/src/gtest-typed-test.cc', |
| 12 'googletest/src/gtest.cc' | 19 'googletest/src/gtest.cc' |
| 13 ], | 20 ], |
| 14 'direct_dependent_settings': { | 21 'direct_dependent_settings': { |
| 15 'include_dirs': [ | 22 'include_dirs': [ |
| 16 'googletest', | 23 'googletest', |
| 17 'googletest/include' | 24 'googletest/include' |
| 18 ] | 25 ] |
|
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
| |
| 19 } | 26 }, |
| 27 'conditions': [[ | |
| 28 'OS=="win"', | |
| 29 { | |
| 30 'defines': [ '_VARIADIC_MAX=10' ], | |
| 31 } | |
| 32 ]], | |
| 20 }, | 33 }, |
| 21 { | 34 { |
| 22 'target_name': 'googletest_main', | 35 'target_name': 'googletest_main', |
| 23 'type': '<(library)', | 36 'type': '<(library)', |
| 24 'sources': ['googletest/src/gtest_main.cc'], | 37 'sources': ['googletest/src/gtest_main.cc'], |
| 25 'dependencies': ['googletest'], | 38 'dependencies': ['googletest'], |
| 26 'export_dependent_settings': ['googletest'] | 39 'export_dependent_settings': ['googletest'] |
| 27 }] | 40 }] |
| 28 } | 41 } |
| OLD | NEW |