From 5db956d0bb95a2c94fb23625bc50f3085fc4087d Mon Sep 17 00:00:00 2001 From: "evan@chromium.org" Date: Tue, 28 Apr 2009 18:36:12 +0000 Subject: gtest shouldn't link in gtest_main.cc, as that provides its own main(). Split gtest into two libraries, where the latter provides main(). This is consistent with the way gtest works within Google and with its automake files. Fix binaries that require gtest's main() to depend on gtest.gyp:main. Review URL: http://codereview.chromium.org/99132 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14755 0039d316-1c4b-4281-b951-d872f2087c98 --- testing/gtest.gyp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'testing') 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', + ], + }, ], } -- cgit v1.1