From 72be5848ce46b89f3de57d5e353f2d5c3769c2be Mon Sep 17 00:00:00 2001 From: Ladislas de Toldi Date: Fri, 13 Sep 2019 17:55:15 +0200 Subject: [PATCH] update googletest to v1.8.1 --- UNITTESTS/CMakeLists.txt | 4 ++-- UNITTESTS/googletest-CMakeLists.txt.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt index 926d13b8a4..9b395daaca 100644 --- a/UNITTESTS/CMakeLists.txt +++ b/UNITTESTS/CMakeLists.txt @@ -52,8 +52,8 @@ add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src # dependencies automatically when using CMake 2.8.11 or # later. target_include_directories(gmock_main SYSTEM BEFORE INTERFACE - "${gtest_SOURCE_DIR}/include" - "${gmock_SOURCE_DIR}/include") + "$" + "$") #################### # TESTING diff --git a/UNITTESTS/googletest-CMakeLists.txt.in b/UNITTESTS/googletest-CMakeLists.txt.in index 9041496e1b..f4b4894a51 100644 --- a/UNITTESTS/googletest-CMakeLists.txt.in +++ b/UNITTESTS/googletest-CMakeLists.txt.in @@ -5,7 +5,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG 8bc11c040a1dcbe50c340b21d78175d152dd3837 + GIT_TAG release-1.8.1 SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src" BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build" CONFIGURE_COMMAND ""