From 5d97318f36e96916b52df41903f7e022de25ef8f Mon Sep 17 00:00:00 2001 From: Chuck Atkins <chuck.atkins@kitware.com> Date: Mon, 19 Jun 2017 22:17:08 -0400 Subject: [PATCH] Switch to gtest/master --- thirdparty/GTest/CMakeLists.txt | 1 + thirdparty/GTest/update.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/thirdparty/GTest/CMakeLists.txt b/thirdparty/GTest/CMakeLists.txt index dc8e16134..f70fdfee3 100644 --- a/thirdparty/GTest/CMakeLists.txt +++ b/thirdparty/GTest/CMakeLists.txt @@ -1,4 +1,5 @@ set(BUILD_GTEST ON) set(BUILD_GMOCK OFF) +set(gtest_disable_pthreads ON) add_subdirectory(googletest) diff --git a/thirdparty/GTest/update.sh b/thirdparty/GTest/update.sh index 7cd97a8c1..96d609c7c 100755 --- a/thirdparty/GTest/update.sh +++ b/thirdparty/GTest/update.sh @@ -8,7 +8,7 @@ readonly name="GoogleTest" readonly ownership="Google Test Upstream <robot@adios2>" readonly subtree="thirdparty/GTest/googletest" readonly repo="https://github.com/google/googletest.git" -readonly tag="release-1.8.0" +readonly tag="master" readonly shortlog="true" readonly paths=" " -- GitLab