From f5908cfe6938dfadb786e356151cf96d2e86e7e4 Mon Sep 17 00:00:00 2001 From: mutouyun Date: Sat, 29 Jul 2023 13:26:06 +0800 Subject: [PATCH] clean up unnecessary 3rdparty library files --- 3rdparty/fmtlib-src | 1 - 3rdparty/googlebenchmark-src | 1 - 3rdparty/googletest-src | 1 - benchmark/CMakeLists.txt | 4 ++-- test/CMakeLists.txt | 7 +++++-- 5 files changed, 7 insertions(+), 7 deletions(-) delete mode 160000 3rdparty/fmtlib-src delete mode 160000 3rdparty/googlebenchmark-src delete mode 160000 3rdparty/googletest-src diff --git a/3rdparty/fmtlib-src b/3rdparty/fmtlib-src deleted file mode 160000 index a337011..0000000 --- a/3rdparty/fmtlib-src +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a33701196adfad74917046096bf5a2aa0ab0bb50 diff --git a/3rdparty/googlebenchmark-src b/3rdparty/googlebenchmark-src deleted file mode 160000 index 361e8d1..0000000 --- a/3rdparty/googlebenchmark-src +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 361e8d1cfe0c6c36d30b39f1b61302ece5507320 diff --git a/3rdparty/googletest-src b/3rdparty/googletest-src deleted file mode 160000 index 1546095..0000000 --- a/3rdparty/googletest-src +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 15460959cbbfa20e66ef0b5ab497367e47fc0a04 diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt index a81d85f..50b2119 100644 --- a/benchmark/CMakeLists.txt +++ b/benchmark/CMakeLists.txt @@ -14,8 +14,8 @@ FetchContent_Declare(googlebenchmark GIT_REPOSITORY https://github.com/google/benchmark.git GIT_TAG v1.7.0 ) -set(BENCHMARK_ENABLE_TESTING OFF) -set(BENCHMARK_ENABLE_INSTALL OFF) +set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE) +set(BENCHMARK_ENABLE_INSTALL OFF CACHE BOOL "" FORCE) add_definitions(-DBENCHMARK_STATIC_DEFINE) FetchContent_MakeAvailable(googlebenchmark) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index d7b2779..bbd37cd 100755 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -6,6 +6,9 @@ if(NOT MSVC) -Wno-missing-field-initializers -Wno-unused-variable -Wno-unused-function) +else() + add_compile_options( + /wd4723) endif() FetchContent_Declare(googletest @@ -14,9 +17,9 @@ FetchContent_Declare(googletest ) set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) if (LIBIPC_USE_STATIC_CRT) - set(gtest_force_shared_crt OFF) + set(gtest_force_shared_crt OFF CACHE BOOL "" FORCE) else() - set(gtest_force_shared_crt ON) + set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) endif() FetchContent_MakeAvailable(googletest)