From 325a07fe406dd8e5ee346d53f673ec5034bf6861 Mon Sep 17 00:00:00 2001 From: David Sankel Date: Tue, 8 Oct 2024 18:18:06 -0400 Subject: [PATCH] Simplify CMakeLists.txt (#42) * Simplify CMakeLists.txt The `block()` isn't needed since we can set CMake options via. CMAKE_ARGS. * Remove CMAKE_ARGS parameter that wasn't working. CMAKE_ARGS isn't used when a directory is brought in via `add_subdirectory`. Instead, variables need to be set in a block. Additionally, the block is only needed for the `FetchContent_MakeAvailable` call. --- CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 828ed70..a1a4550 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,16 +14,16 @@ include(FetchContent) if(BUILD_TESTING) enable_testing() + # Fetch GoogleTest + FetchContent_Declare( + googletest + GIT_REPOSITORY https://github.com/google/googletest.git + GIT_TAG f8d7d77c06936315286eb55f8de22cd23c188571 # release-1.14.0 + EXCLUDE_FROM_ALL + ) block() - # Disable installing google test dependency on cmake --install - set(INSTALL_GTEST OFF) - - # Fetch GoogleTest - FetchContent_Declare( - googletest - GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG f8d7d77c06936315286eb55f8de22cd23c188571 # release-1.14.0 - EXCLUDE_FROM_ALL CMAKE_ARGS -DBUILD_TESTING=OFF) + set(INSTALL_GTEST OFF) # Disable GoogleTest installation + set(BUILD_TESTING OFF) # Disable GoogleTest tests FetchContent_MakeAvailable(googletest) endblock() endif()