From 70c5de13cd9e2ce94181fe67d9a70eb371ecd554 Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Mon, 4 Mar 2024 17:07:34 -0800 Subject: [PATCH 1/2] Use cmake's find_package to link to GTest Otherwise the gtest transitive dependency isn't linked properly when GoogleTest is built to have shared libraries. --- tests/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9017edc586..2e044e686f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -67,10 +67,11 @@ set(INSTALL_GTEST CACHE BOOL OFF) FetchContent_MakeAvailable(googletest) find_package(OpenMP REQUIRED) +find_package(GTest CONFIG REQUIRED) target_link_libraries(faiss_test PRIVATE OpenMP::OpenMP_CXX - gtest_main + GTest::gtest_main $<$:raft::raft> ) From 8cbe6bb4a8f7a39daa8977f286262e9e16929a46 Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Tue, 19 Mar 2024 21:27:57 -0700 Subject: [PATCH 2/2] Remove FetchContent instructions for GTest --- tests/CMakeLists.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 2e044e686f..0cb8219096 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -59,13 +59,6 @@ if(FAISS_OPT_LEVEL STREQUAL "avx512") target_link_libraries(faiss_test PRIVATE faiss_avx512) endif() -include(FetchContent) -FetchContent_Declare(googletest - URL "https://github.com/google/googletest/archive/release-1.12.1.tar.gz") -set(BUILD_GMOCK CACHE BOOL OFF) -set(INSTALL_GTEST CACHE BOOL OFF) -FetchContent_MakeAvailable(googletest) - find_package(OpenMP REQUIRED) find_package(GTest CONFIG REQUIRED)