diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-26 22:05:05 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-26 22:05:05 +0000 |
| commit | fe60195a19a160fa09f76aab21f355e63caa4faa (patch) | |
| tree | 0d7157d0fc8198d799e35a059572d727bebce2ea /testing/gtest.gyp | |
| parent | f191d1bd7601d9be5aea71b1890a85d6e16707dc (diff) | |
| download | chromium_src-fe60195a19a160fa09f76aab21f355e63caa4faa.zip chromium_src-fe60195a19a160fa09f76aab21f355e63caa4faa.tar.gz chromium_src-fe60195a19a160fa09f76aab21f355e63caa4faa.tar.bz2 | |
Revert "Checkin a version of gmock, modified to use our boost_tuple in VS2005."
This reverts commit 071e95bcdcefcd2cb86c9aed5cb073bbcaa7f2a7.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16931 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/gtest.gyp')
| -rw-r--r-- | testing/gtest.gyp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp index 061667e..c7d5c62 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -3,6 +3,9 @@ # found in the LICENSE file. { + 'variables': { + 'chromium_code': 1, + }, 'includes': [ '../build/common.gypi', ], @@ -53,7 +56,8 @@ 'UNIT_TEST', ], 'include_dirs': [ - 'gtest/include', # So that gtest headers can find themselves. + 'gtest', + 'gtest/include', ], 'target_conditions': [ ['_type=="executable"', {'test': 1}], |