From 29e94c3b68593f246e6933030ac2a06d820fd165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20Angelovi=C4=8D?= Date: Tue, 20 Feb 2024 16:02:26 +0100 Subject: [PATCH] fix(cmake): rename forgotten CMake variables --- tests/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 507fd5b..27e05e7 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -2,12 +2,12 @@ # DOWNLOAD AND BUILD OF GOOGLETEST #------------------------------- -find_package(GTest ${GOOGLETEST_VERSION} CONFIG) +find_package(GTest ${SDBUSCPP_GOOGLETEST_VERSION} CONFIG) if (NOT TARGET GTest::gmock) # Try pkg-config if GTest was not found through CMake config find_package(PkgConfig) if (PkgConfig_FOUND) - pkg_check_modules(GMock IMPORTED_TARGET GLOBAL gmock>=${GOOGLETEST_VERSION}) + pkg_check_modules(GMock IMPORTED_TARGET GLOBAL gmock>=${SDBUSCPP_GOOGLETEST_VERSION}) if(TARGET PkgConfig::GMock) add_library(GTest::gmock ALIAS PkgConfig::GMock) endif() @@ -16,15 +16,15 @@ if (NOT TARGET GTest::gmock) if (NOT TARGET GTest::gmock) include(FetchContent) - if (GOOGLETEST_VERSION VERSION_GREATER_EQUAL 1.13.0) - set(GOOGLETEST_TAG "v${GOOGLETEST_VERSION}") + if (SDBUSCPP_GOOGLETEST_VERSION VERSION_GREATER_EQUAL 1.13.0) + set(GOOGLETEST_TAG "v${SDBUSCPP_GOOGLETEST_VERSION}") else() - set(GOOGLETEST_TAG "release-${GOOGLETEST_VERSION}") + set(GOOGLETEST_TAG "release-${SDBUSCPP_GOOGLETEST_VERSION}") endif() - message("Manually fetching & building googletest v${GOOGLETEST_VERSION}...") + message("Manually fetching & building googletest ${GOOGLETEST_TAG}...") FetchContent_Declare(googletest - GIT_REPOSITORY ${GOOGLETEST_GIT_REPO} + GIT_REPOSITORY ${SDBUSCPP_GOOGLETEST_GIT_REPO} GIT_TAG ${GOOGLETEST_TAG} GIT_SHALLOW 1 UPDATE_COMMAND "")