From 411ff10a0372c08099a268aaff40b2202a60e957 Mon Sep 17 00:00:00 2001 From: Frederick Roy Date: Fri, 2 Feb 2024 10:37:08 +0900 Subject: [PATCH] apply suggestion by using GTest ; and remove CONFIG keyword --- Sofa/framework/Testing/CMakeLists.txt | 8 ++++---- Sofa/framework/Testing/Sofa.TestingConfig.cmake.in | 2 +- Sofa/framework/Testing/SofaGTestMain/CMakeLists.txt | 4 ++-- .../Testing/SofaGTestMain/SofaGTestMainConfig.cmake.in | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Sofa/framework/Testing/CMakeLists.txt b/Sofa/framework/Testing/CMakeLists.txt index 5076cf139173..635b7f6c29d1 100644 --- a/Sofa/framework/Testing/CMakeLists.txt +++ b/Sofa/framework/Testing/CMakeLists.txt @@ -6,8 +6,8 @@ enable_testing() # add googletest library # set(googletest_disable_pthreads ON CACHE INTERNAL "") -find_package(googletest QUIET) -if(NOT googletest_FOUND AND SOFA_ALLOW_FETCH_DEPENDENCIES) +find_package(GTest QUIET) +if(NOT GTest_FOUND AND SOFA_ALLOW_FETCH_DEPENDENCIES) message("${PROJECT_NAME}: DEPENDENCY googletest NOT FOUND. SOFA_ALLOW_FETCH_DEPENDENCIES is ON, fetching googletest...") include(FetchContent) @@ -45,7 +45,7 @@ if(NOT googletest_FOUND AND SOFA_ALLOW_FETCH_DEPENDENCIES) set_target_properties(gtest PROPERTIES FOLDER Testing) set_target_properties(gtest_main PROPERTIES FOLDER Testing) endif() -elseif (NOT googletest_FOUND) +elseif (NOT GTest_FOUND) message(FATAL_ERROR "${PROJECT_NAME}: DEPENDENCY googletest NOT FOUND. SOFA_ALLOW_FETCH_DEPENDENCIES is OFF and thus cannot be fetched. Install googletest, or enable SOFA_ALLOW_FETCH_DEPENDENCIES to fix this issue.") endif() @@ -82,7 +82,7 @@ sofa_find_package(Sofa.Core REQUIRED) sofa_find_package(Sofa.Simulation.Graph REQUIRED) add_library(${PROJECT_NAME} SHARED ${HEADER_FILES} ${SOURCE_FILES}) -target_link_libraries(${PROJECT_NAME} PUBLIC Sofa.Helper Sofa.DefaultType Sofa.Core Sofa.Simulation.Graph gtest SofaGTestMain ) +target_link_libraries(${PROJECT_NAME} PUBLIC Sofa.Helper Sofa.DefaultType Sofa.Core Sofa.Simulation.Graph GTest::gtest SofaGTestMain ) target_compile_options(${PROJECT_NAME} PUBLIC "-DGTEST_LINKED_AS_SHARED_LIBRARY=1") set(SOFA_TESTING_RESOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/resources") diff --git a/Sofa/framework/Testing/Sofa.TestingConfig.cmake.in b/Sofa/framework/Testing/Sofa.TestingConfig.cmake.in index 78d7ebdeeb5a..b5ee077871cd 100644 --- a/Sofa/framework/Testing/Sofa.TestingConfig.cmake.in +++ b/Sofa/framework/Testing/Sofa.TestingConfig.cmake.in @@ -4,7 +4,7 @@ @PACKAGE_INIT@ find_package(Threads QUIET REQUIRED) -find_package(GTest CONFIG QUIET REQUIRED) +find_package(GTest QUIET REQUIRED) find_package(SofaGTestMain QUIET REQUIRED) find_package(Sofa.Helper QUIET REQUIRED) find_package(Sofa.DefaultType QUIET REQUIRED) diff --git a/Sofa/framework/Testing/SofaGTestMain/CMakeLists.txt b/Sofa/framework/Testing/SofaGTestMain/CMakeLists.txt index 713c7c42ff28..55bca42d69d6 100644 --- a/Sofa/framework/Testing/SofaGTestMain/CMakeLists.txt +++ b/Sofa/framework/Testing/SofaGTestMain/CMakeLists.txt @@ -3,11 +3,11 @@ project(SofaGTestMain) ## Dependencies sofa_find_package(Sofa.Simulation.Graph REQUIRED) -sofa_find_package(GTest CONFIG REQUIRED) +sofa_find_package(GTest REQUIRED) add_library(${PROJECT_NAME} SofaGTestMain.cpp) target_link_libraries(${PROJECT_NAME} PUBLIC Sofa.Helper Sofa.Simulation.Graph) -target_link_libraries(${PROJECT_NAME} PUBLIC gtest) +target_link_libraries(${PROJECT_NAME} PUBLIC GTest::gtest) ## Install rules for the library; CMake package configurations files sofa_create_package_with_targets( diff --git a/Sofa/framework/Testing/SofaGTestMain/SofaGTestMainConfig.cmake.in b/Sofa/framework/Testing/SofaGTestMain/SofaGTestMainConfig.cmake.in index ec53c2e5ab38..980a99eaf8d6 100644 --- a/Sofa/framework/Testing/SofaGTestMain/SofaGTestMainConfig.cmake.in +++ b/Sofa/framework/Testing/SofaGTestMain/SofaGTestMainConfig.cmake.in @@ -3,7 +3,7 @@ @PACKAGE_INIT@ find_package(Sofa.Simulation.Graph QUIET REQUIRED) -find_package(GTest CONFIG QUIET REQUIRED) +find_package(GTest QUIET REQUIRED) if(NOT TARGET SofaGTestMain) include("${CMAKE_CURRENT_LIST_DIR}/SofaGTestMainTargets.cmake")