diff --git a/ci/setup_cmake.sh b/ci/setup_cmake.sh index f3d66687ad..8638285b59 100755 --- a/ci/setup_cmake.sh +++ b/ci/setup_cmake.sh @@ -8,9 +8,14 @@ set -e export DEBIAN_FRONTEND=noninteractive apt-get update -export CMAKE_VERSION=3.15.2 - -[ -z "${GOOGLETEST_VERSION}" ] && export GOOGLETEST_VERSION=1.12.1 +if [ "x$CMAKE_VERSION" = "x" ]; then +export GOOGLETEST_VERSION=1.10.0 + export CMAKE_VERSION=3.15.2 +fi + +if [ "x$GOOGLETEST_VERSION" = "x" ]; then + export GOOGLETEST_VERSION=1.12.1 +fi cmake_install() { tmp_dir=$(mktemp -d)