diff options
author | Jon Skeet <skeet@pobox.com> | 2015-06-19 17:35:01 +0100 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2015-06-19 17:35:01 +0100 |
commit | 50a3a809e849fad5a53be5ccbaefaa02a106b535 (patch) | |
tree | 8c4441b6abee41b5e960e7013e5aeb6761616a22 /autogen.sh | |
parent | 8e9dd12b3a2a30dacf3b782d4062c43ec68ff2f6 (diff) | |
parent | 5b3a8e76356ef2dcb4a87c3fa7323bdec01cf7ce (diff) | |
download | protobuf-50a3a809e849fad5a53be5ccbaefaa02a106b535.tar.gz protobuf-50a3a809e849fad5a53be5ccbaefaa02a106b535.tar.bz2 protobuf-50a3a809e849fad5a53be5ccbaefaa02a106b535.zip |
Merge remote-tracking branch 'upstream/master' into proto3-only
Diffstat (limited to 'autogen.sh')
-rwxr-xr-x | autogen.sh | 23 |
1 files changed, 7 insertions, 16 deletions
@@ -15,27 +15,18 @@ __EOF__ exit 1 fi -# Check that gtest is present. Usually it is already there since the +# Check that gmock is present. Usually it is already there since the # directory is set up as an SVN external. -if test ! -e gtest; then - echo "Google Test not present. Fetching gtest-1.7.0 from the web..." - curl -O https://googletest.googlecode.com/files/gtest-1.7.0.zip - unzip -q gtest-1.7.0.zip - rm gtest-1.7.0.zip - mv gtest-1.7.0 gtest +if test ! -e gmock; then + echo "Google Mock not present. Fetching gmock-1.7.0 from the web..." + curl -O https://googlemock.googlecode.com/files/gmock-1.7.0.zip + unzip -q gmock-1.7.0.zip + rm gmock-1.7.0.zip + mv gmock-1.7.0 gmock fi set -ex -# Temporary hack: Must change C runtime library to "multi-threaded DLL", -# otherwise it will be set to "multi-threaded static" when MSVC upgrades -# the project file to MSVC 2005/2008. vladl of Google Test says gtest will -# probably change their default to match, then this will be unnecessary. -# One of these mappings converts the debug configuration and the other -# converts the release configuration. I don't know which is which. -sed -i -e 's/RuntimeLibrary="5"/RuntimeLibrary="3"/g; - s/RuntimeLibrary="4"/RuntimeLibrary="2"/g;' gtest/msvc/*.vcproj - # TODO(kenton): Remove the ",no-obsolete" part and fix the resulting warnings. autoreconf -f -i -Wall,no-obsolete |