From 82e5db638808fbf67ddf987605f465d16cbc024b Mon Sep 17 00:00:00 2001 From: "Balos, Cody, J" Date: Wed, 25 Oct 2023 12:44:52 -0700 Subject: [PATCH] uncomment GTest cmake --- cmake/SundialsSetupTesting.cmake | 34 +++++++++++++------------ test/unit_tests/sundials/CMakeLists.txt | 6 ++--- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/cmake/SundialsSetupTesting.cmake b/cmake/SundialsSetupTesting.cmake index 195aac3b4b..de51ce06a9 100644 --- a/cmake/SundialsSetupTesting.cmake +++ b/cmake/SundialsSetupTesting.cmake @@ -136,22 +136,24 @@ endif() # Check if unit tests are enabled if(SUNDIALS_TEST_UNITTESTS) - # message(WARNING "Could not find Google Test so we are cloning it from GitHub...") - # include(FetchContent) - # FetchContent_Declare( - # googletest - # URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip - # ) - # if(WIN32) - # # For Windows: Prevent overriding the parent project's compiler/linker settings - # set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - # endif() - # FetchContent_GetProperties(googletest) - # if(NOT googletest_POPULATED) - # FetchContent_Populate(googletest) - # add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) - # endif() - # include(GoogleTest) + find_package(GTest) + if(NOT TARGET GTest::gtest_main) + include(FetchContent) + FetchContent_Declare( + googletest + URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip + ) + if(WIN32) + # For Windows: Prevent overriding the parent project's compiler/linker settings + set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) + endif() + FetchContent_GetProperties(googletest) + if(NOT googletest_POPULATED) + FetchContent_Populate(googletest) + add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) + endif() + include(GoogleTest) + endif() endif() # If examples are installed, create post install smoke test targets diff --git a/test/unit_tests/sundials/CMakeLists.txt b/test/unit_tests/sundials/CMakeLists.txt index d3fada71d8..dc9ce4c8b0 100644 --- a/test/unit_tests/sundials/CMakeLists.txt +++ b/test/unit_tests/sundials/CMakeLists.txt @@ -10,8 +10,8 @@ # SUNDIALS Copyright End # --------------------------------------------------------------- -# add_executable(test_sundials_errors test_sundials_errors.cpp) -# target_link_libraries(test_sundials_errors PRIVATE sundials_generic GTest::gtest_main GTest::gmock) -# gtest_discover_tests(test_sundials_errors) +add_executable(test_sundials_errors test_sundials_errors.cpp) +target_link_libraries(test_sundials_errors PRIVATE sundials_generic GTest::gtest_main GTest::gmock) +gtest_discover_tests(test_sundials_errors) add_subdirectory(reductions)