From cd1e144ef595a553bd3bd54621550ac5e13ded6b Mon Sep 17 00:00:00 2001 From: Mizux Seiha Date: Sun, 26 Mar 2023 11:04:45 +0200 Subject: [PATCH] deps: bump googletest v1.13.0 --- CMakeLists.txt | 8 ++++++++ WORKSPACE | 2 +- cmake/dependencies/CMakeLists.txt | 16 +++++++--------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 07bcaccc0b..4c82fbecb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,6 +176,14 @@ if(BUILD_LP_PARSER) message(STATUS "Build re2: ${BUILD_re2}") endif() +if(BUILD_TESTING) + CMAKE_DEPENDENT_OPTION(BUILD_googletest "Build googletest" OFF + "NOT BUILD_DEPS" ON) + message(STATUS "Build googletest: ${BUILD_googletest}") +else() + set(BUILD_googletest OFF) +endif() + # Optional third party solvers (enabled by default) ## COIN-OR Solvers (Cbc, Clp) CMAKE_DEPENDENT_OPTION(USE_COINOR "Use the COIN-OR solver" ON "BUILD_CXX" OFF) diff --git a/WORKSPACE b/WORKSPACE index a524214d10..2e64533018 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -55,7 +55,7 @@ git_repository( git_repository( name = "com_google_googletest", - tag = "release-1.12.1", + tag = "v1.13.0", remote = "https://github.com/google/googletest.git", ) diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt index 7ce265cdd3..113ad70570 100644 --- a/cmake/dependencies/CMakeLists.txt +++ b/cmake/dependencies/CMakeLists.txt @@ -336,13 +336,11 @@ endif() ############### ## TESTING ## ############### -if(BUILD_TESTING) - if(BUILD_googletest) - FetchContent_Declare( - googletest - GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG main) - set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - FetchContent_MakeAvailable(googletest) - endif() +if(BUILD_googletest) + FetchContent_Declare( + googletest + GIT_REPOSITORY https://github.com/google/googletest.git + GIT_TAG v1.13.0) + set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) + FetchContent_MakeAvailable(googletest) endif()