Repository: kudu Updated Branches: refs/heads/master 0f31386d2 -> f329e089f
Bump googletest The new clang tidy is issuing warnings about gtest macros, the new version seems to fix the issue. Change-Id: I1cf6eee7007857f66b4177d3bfed665d8702e37f Reviewed-on: http://gerrit.cloudera.org:8080/7089 Reviewed-by: Adar Dembo <[email protected]> Reviewed-by: Todd Lipcon <[email protected]> Tested-by: Kudu Jenkins Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/f329e089 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/f329e089 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/f329e089 Branch: refs/heads/master Commit: f329e089f6ac1ee2fcb4a4e65fb34ef0d3d374d5 Parents: 0f31386 Author: Dan Burkert <[email protected]> Authored: Mon Jun 5 15:35:26 2017 -0700 Committer: Dan Burkert <[email protected]> Committed: Tue Jun 6 00:23:10 2017 +0000 ---------------------------------------------------------------------- thirdparty/build-definitions.sh | 10 +++------- thirdparty/download-thirdparty.sh | 2 +- thirdparty/vars.sh | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/f329e089/thirdparty/build-definitions.sh ---------------------------------------------------------------------- diff --git a/thirdparty/build-definitions.sh b/thirdparty/build-definitions.sh index bf70f6c..4045cd0 100644 --- a/thirdparty/build-definitions.sh +++ b/thirdparty/build-definitions.sh @@ -327,15 +327,11 @@ build_gmock() { -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_POSITION_INDEPENDENT_CODE=On \ -DBUILD_SHARED_LIBS=$SHARED \ - $GMOCK_SOURCE - make -j$PARALLEL $EXTRA_MAKEFLAGS + -DCMAKE_INSTALL_PREFIX=$PREFIX \ + $GMOCK_SOURCE/googlemock + make -j$PARALLEL $EXTRA_MAKEFLAGS install popd done - echo Installing gmock... - cp -a $GMOCK_SHARED_BDIR/libgmock.$DYLIB_SUFFIX $PREFIX/lib/ - cp -a $GMOCK_STATIC_BDIR/libgmock.a $PREFIX/lib/ - rsync -av $GMOCK_SOURCE/include/ $PREFIX/include/ - rsync -av $GMOCK_SOURCE/gtest/include/ $PREFIX/include/ } build_protobuf() { http://git-wip-us.apache.org/repos/asf/kudu/blob/f329e089/thirdparty/download-thirdparty.sh ---------------------------------------------------------------------- diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh index 05f8fed..4238c08 100755 --- a/thirdparty/download-thirdparty.sh +++ b/thirdparty/download-thirdparty.sh @@ -117,7 +117,7 @@ if [ ! -d $GLOG_SOURCE ]; then fi if [ ! -d $GMOCK_SOURCE ]; then - fetch_and_expand gmock-${GMOCK_VERSION}.zip + fetch_and_expand googletest-release-${GMOCK_VERSION}.tar.gz fi if [ ! -d $GFLAGS_SOURCE ]; then http://git-wip-us.apache.org/repos/asf/kudu/blob/f329e089/thirdparty/vars.sh ---------------------------------------------------------------------- diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh index 6a39cd2..3e90a00 100644 --- a/thirdparty/vars.sh +++ b/thirdparty/vars.sh @@ -42,8 +42,8 @@ GLOG_VERSION=0.3.5 GLOG_NAME=glog-$GLOG_VERSION GLOG_SOURCE=$TP_SOURCE_DIR/$GLOG_NAME -GMOCK_VERSION=1.7.0 -GMOCK_NAME=gmock-$GMOCK_VERSION +GMOCK_VERSION=1.8.0 +GMOCK_NAME=googletest-release-$GMOCK_VERSION GMOCK_SOURCE=$TP_SOURCE_DIR/$GMOCK_NAME GPERFTOOLS_VERSION=2.2.1
