From 27cb792c522e22f5acc086740003e3e9e3374813 Mon Sep 17 00:00:00 2001 From: Henry Fredrick Schreiner Date: Thu, 5 Apr 2018 13:09:00 +0200 Subject: [PATCH] Small cleanup to AddGoogleTest --- cmake/AddGoogletest.cmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmake/AddGoogletest.cmake b/cmake/AddGoogletest.cmake index 91e0465..0c035d2 100644 --- a/cmake/AddGoogletest.cmake +++ b/cmake/AddGoogletest.cmake @@ -4,7 +4,8 @@ # gives output on failed tests without having to set an environment variable. # # -set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) +set(gtest_force_shared_crt CACHE INTERNAL ON) +set(BUILD_SHARED_LIBS OFF) if(CMAKE_VERSION VERSION_LESS 3.11) set(UPDATE_DISCONNECTED_IF_AVAILABLE "UPDATE_DISCONNECTED 1") @@ -19,7 +20,6 @@ if(CMAKE_VERSION VERSION_LESS 3.11) # CMake warning suppression will not be needed in version 1.9 set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS 1 CACHE BOOL "") add_subdirectory(${googletest_SOURCE_DIR} ${googletest_SOURCE_DIR} EXCLUDE_FROM_ALL) - unset(CMAKE_SUPPRESS_DEVELOPER_WARNINGS) else() include(FetchContent) FetchContent_Declare(googletest @@ -30,7 +30,6 @@ else() FetchContent_Populate(googletest) set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS 1 CACHE BOOL "") add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL) - unset(CMAKE_SUPPRESS_DEVELOPER_WARNINGS) endif() endif() -- libgit2 0.21.4