From da88817227a3da5ec90d2603521cfe7ff82d26f5 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Wed, 2 Mar 2022 11:07:58 +0100 Subject: [PATCH] bump gtest on windows to 1.11 to support C++20; thanks to AnyOldName3 --- CI/before_script.msvc.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index 17ff27f9f1..94c0f5fa46 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -608,12 +608,12 @@ if [ -z $SKIP_DOWNLOAD ]; then "LuaJIT-2.1.0-beta3-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" # Google test and mock - if [ ! -z $TEST_FRAMEWORK ]; then - echo "Google test 1.10.0..." + if [ -n "$TEST_FRAMEWORK" ]; then + echo "Google test 1.11.0..." if [ -d googletest ]; then printf " Google test exists, skipping." else - git clone -b release-1.10.0 https://github.com/google/googletest.git + git clone -b release-1.11.0 https://github.com/google/googletest.git fi fi @@ -1002,8 +1002,8 @@ printf "LuaJIT 2.1.0-beta3... " cd $DEPS echo # Google Test and Google Mock -if [ ! -z $TEST_FRAMEWORK ]; then - printf "Google test 1.10.0 ..." +if [ -n "$TEST_FRAMEWORK" ]; then + printf "Google test 1.11.0 ..." cd googletest mkdir -p build${MSVC_REAL_YEAR}