From 46d27e37d73df5a772efc19210796c7a91dfe751 Mon Sep 17 00:00:00 2001 From: XuanYang-cn Date: Thu, 8 Apr 2021 10:01:18 +0800 Subject: [PATCH] Skip install gtest when build with test Signed-off-by: XuanYang-cn --- .gitignore | 2 ++ .../core/thirdparty/google_benchmark/CMakeLists.txt | 1 - internal/core/thirdparty/gtest/CMakeLists.txt | 12 +++++++++++- internal/core/unittest/CMakeLists.txt | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1178e453bd..86b253e7eb 100644 --- a/.gitignore +++ b/.gitignore @@ -67,6 +67,8 @@ cwrapper_build **/.lint typescript **/.pytest_cache/ +.root +gtags.conf # Delve generated file **/__debug_bin diff --git a/internal/core/thirdparty/google_benchmark/CMakeLists.txt b/internal/core/thirdparty/google_benchmark/CMakeLists.txt index e5406dce8b..b67e438a6f 100644 --- a/internal/core/thirdparty/google_benchmark/CMakeLists.txt +++ b/internal/core/thirdparty/google_benchmark/CMakeLists.txt @@ -1,4 +1,3 @@ -include(FetchContent) FetchContent_Declare(google_benchmark URL https://github.com/google/benchmark/archive/v1.5.2.tar.gz URL_MD5 084b34aceaeac11a6607d35220ca2efa diff --git a/internal/core/thirdparty/gtest/CMakeLists.txt b/internal/core/thirdparty/gtest/CMakeLists.txt index 895cae7166..f676e0c90d 100644 --- a/internal/core/thirdparty/gtest/CMakeLists.txt +++ b/internal/core/thirdparty/gtest/CMakeLists.txt @@ -29,7 +29,17 @@ FetchContent_Declare( BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/googletest-build DOWNLOAD_DIR ${THIRDPARTY_DOWNLOAD_PATH} ) -FetchContent_MakeAvailable(googletest) +FetchContent_GetProperties( googletest ) +if ( NOT googletest_POPULATED ) + + FetchContent_Populate( googletest ) + + # Adding the following targets: + # gtest, gtest_main, gmock, gmock_main + add_subdirectory( ${googletest_SOURCE_DIR} + ${googletest_BINARY_DIR} + EXCLUDE_FROM_ALL ) +endif() # include(GoogleTest) # **************************************************************** diff --git a/internal/core/unittest/CMakeLists.txt b/internal/core/unittest/CMakeLists.txt index 75998a0c85..5b8a851645 100644 --- a/internal/core/unittest/CMakeLists.txt +++ b/internal/core/unittest/CMakeLists.txt @@ -55,3 +55,4 @@ target_link_libraries(all_tests ) install (TARGETS all_tests DESTINATION unittest) +install (TARGETS index_builder_test DESTINATION unittest)