diff --git a/build-all.bat b/build-all.bat index e92407886..ab47fd8b5 100644 --- a/build-all.bat +++ b/build-all.bat @@ -14,7 +14,7 @@ if DEFINED GIT_PULL_TOKEN ( set GTEST_PATH=third_party\googletest if NOT EXIST %GTEST_PATH%\CMakeLists.txt ( - git clone --depth 1 --branch release-1.11.0 https://github.com/google/googletest %GTEST_PATH% + git clone --depth 1 --branch release-1.12.1 https://github.com/google/googletest %GTEST_PATH% ) set CUSTOM_PROPS= diff --git a/build-gtest.sh b/build-gtest.sh index d58034fec..c92c0f2dc 100755 --- a/build-gtest.sh +++ b/build-gtest.sh @@ -19,7 +19,7 @@ GTEST_PATH=third_party/googletest if [ ! "$(ls -A $GTEST_PATH/CMakeLists.txt)" ]; then echo Clone googletest from google/googletest:master ... rm -rf ${GTEST_PATH} #delete just if empty directory exists - git clone --depth 1 --branch release-1.11.0 https://github.com/google/googletest $GTEST_PATH + git clone --depth 1 --branch release-1.12.1 https://github.com/google/googletest $GTEST_PATH else echo "Using existing googletest from thirdparty/" fi diff --git a/build-tests.cmd b/build-tests.cmd index 3058a0195..b73f18689 100644 --- a/build-tests.cmd +++ b/build-tests.cmd @@ -10,7 +10,7 @@ if DEFINED GIT_PULL_TOKEN ( set GTEST_PATH=third_party\googletest if NOT EXIST %GTEST_PATH%\CMakeLists.txt ( - git clone --depth 1 --branch release-1.11.0 https://github.com/google/googletest %GTEST_PATH% + git clone --depth 1 --branch release-1.12.1 https://github.com/google/googletest %GTEST_PATH% ) set PLATFORM= diff --git a/lib/android_build/gradlew.bat b/lib/android_build/gradlew.bat index b663f3737..9f9b5d0a3 100644 --- a/lib/android_build/gradlew.bat +++ b/lib/android_build/gradlew.bat @@ -17,7 +17,7 @@ set APP_HOME=%DIRNAME% set GTEST_PATH=..\..\third_party\googletest if NOT EXIST %GTEST_PATH%\CMakeLists.txt ( rd /S /Q %GTEST_PATH% - git clone --depth 1 --branch release-1.11.0 https://github.com/google/googletest %GTEST_PATH% + git clone --depth 1 --branch release-1.12.1 https://github.com/google/googletest %GTEST_PATH% dir %GTEST_PATH%\googletest\src\gtest-all.cc ) diff --git a/third_party/googletest b/third_party/googletest index e2239ee60..58d77fa80 160000 --- a/third_party/googletest +++ b/third_party/googletest @@ -1 +1 @@ -Subproject commit e2239ee6043f73722e7aa812a459f54a28552929 +Subproject commit 58d77fa8070e8cec2dc1ed015d66b454c8d78850