diff options
| -rw-r--r-- | build/temp_gyp/googleurl.gyp | 1 | ||||
| -rw-r--r-- | printing/printing.gyp | 1 | ||||
| -rw-r--r-- | testing/gtest.gyp | 13 |
3 files changed, 14 insertions, 1 deletions
diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp index b518e4c..d5d0ea7 100644 --- a/build/temp_gyp/googleurl.gyp +++ b/build/temp_gyp/googleurl.gyp @@ -62,6 +62,7 @@ 'dependencies': [ 'googleurl', '../../testing/gtest.gyp:gtest', + '../../testing/gtest.gyp:main', '../../third_party/icu38/icu38.gyp:icuuc', ], 'sources': [ diff --git a/printing/printing.gyp b/printing/printing.gyp index 51768fd..baa6341 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -46,6 +46,7 @@ 'dependencies': [ 'printing', '../testing/gtest.gyp:gtest', + '../testing/gtest.gyp:main', ], 'sources': [ 'units_unittest.cc', diff --git a/testing/gtest.gyp b/testing/gtest.gyp index 078ca3c..88866a6 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -40,7 +40,6 @@ 'gtest/src/gtest-internal-inl.h', 'gtest/src/gtest-port.cc', 'gtest/src/gtest.cc', - 'gtest/src/gtest_main.cc', 'multiprocess_func_list.cc', 'multiprocess_func_list.h', 'platform_test.h', @@ -65,5 +64,17 @@ ], }, }, + { + # Note that calling this "gtest_main" confuses the scons build, + # which uses "_main" on files to produce special behavior. + 'target_name': 'main', + 'type': '<(library)', + 'dependencies': [ + 'gtest', + ], + 'sources': [ + 'gtest/src/gtest_main.cc', + ], + }, ], } |