From 87e0fa0329258282e647063d0ce603cb5fb7e925 Mon Sep 17 00:00:00 2001 From: Bob Chen Date: Mon, 25 Dec 2023 21:48:48 +0800 Subject: [PATCH] Don't use gtest_main and gflags_nothreads --- CMake/Findgflags.cmake | 2 +- CMake/Findgoogletest.cmake | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CMake/Findgflags.cmake b/CMake/Findgflags.cmake index 13d8b5f5..c93c2374 100644 --- a/CMake/Findgflags.cmake +++ b/CMake/Findgflags.cmake @@ -1,6 +1,6 @@ find_path(GFLAGS_INCLUDE_DIRS gflags/gflags.h) -find_library(GFLAGS_LIBRARIES gflags_nothreads) +find_library(GFLAGS_LIBRARIES gflags) find_package_handle_standard_args(gflags DEFAULT_MSG GFLAGS_LIBRARIES GFLAGS_INCLUDE_DIRS) diff --git a/CMake/Findgoogletest.cmake b/CMake/Findgoogletest.cmake index b88ede98..0de8d20f 100644 --- a/CMake/Findgoogletest.cmake +++ b/CMake/Findgoogletest.cmake @@ -1,15 +1,11 @@ find_path(GOOGLETEST_INCLUDE_DIRS gtest/gtest.h gmock/gmock.h) find_library(GOOGLETEST_GTEST_LIBRARIES gtest) -find_library(GOOGLETEST_GTEST_MAIN_LIBRARIES gtest_main) find_library(GOOGLETEST_GMOCK_LIBRARIES gmock) -find_library(GOOGLETEST_GMOCK_MAIN_LIBRARIES gmock_main) set(GOOGLETEST_LIBRARIES ${GOOGLETEST_GTEST_LIBRARIES} - ${GOOGLETEST_GTEST_MAIN_LIBRARIES} ${GOOGLETEST_GMOCK_LIBRARIES} - ${GOOGLETEST_GMOCK_MAIN_LIBRARIES} ) find_package_handle_standard_args(googletest DEFAULT_MSG GOOGLETEST_LIBRARIES GOOGLETEST_INCLUDE_DIRS)