From fba0838a3e6dcfad3213dbfa1d0a176b058520d6 Mon Sep 17 00:00:00 2001 From: Cp-Graham Date: Tue, 24 Sep 2019 15:38:36 +0100 Subject: [PATCH 1/2] current googletest script logic updated --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 79f3464..cb3ec28 100755 --- a/build.sh +++ b/build.sh @@ -67,7 +67,8 @@ function install_gmock {( $NO_DOWNLOAD git clone $REPO cd googletest fi - cd googlemock/make + mkdir -p build && pushd build + cmake .. make -j$NPROC )} From d88b99418cf206857cb664ff726a7be3cb6c8a10 Mon Sep 17 00:00:00 2001 From: Cp-Graham Date: Tue, 24 Sep 2019 17:57:41 +0100 Subject: [PATCH 2/2] adds pinned hash to the googletest --- build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.sh b/build.sh index cb3ec28..7e7bb16 100755 --- a/build.sh +++ b/build.sh @@ -57,15 +57,19 @@ NPROC=$(nproc) function install_gmock {( REPO="https://github.com/google/googletest.git" + # 1.8.1 release of googletest. + PINNED_HASH="2fe3bd994b3189899d93f1d5a881e725e046fdc2" mkdir -p external cd external if [ -d googletest ] then cd googletest $NO_DOWNLOAD git pull + git checkout $PINNED_HASH else $NO_DOWNLOAD git clone $REPO cd googletest + git checkout $PINNED_HASH fi mkdir -p build && pushd build cmake ..