From fccf79d2f3717f4165cb885e1ed3779d9f54aafc Mon Sep 17 00:00:00 2001 From: Daniel Savchenko Date: Fri, 2 Feb 2024 15:06:53 +0100 Subject: [PATCH 1/2] fetch same gtest version --- src/Unittests/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Unittests/CMakeLists.txt b/src/Unittests/CMakeLists.txt index 4090f50f..8a026d23 100644 --- a/src/Unittests/CMakeLists.txt +++ b/src/Unittests/CMakeLists.txt @@ -73,14 +73,16 @@ endif() if (OPENMESH_BUILD_UNIT_TESTS) # Fetch Gtest from github include(FetchContent) + FetchContent_Declare( googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG f8d7d77c06936315286eb55f8de22cd23c188571 # v1.14.0 - #FIND_PACKAGE_ARGS NAMES GTest + GIT_TAG release-1.10.0 ) - # For Windows: Prevent overriding the parent project's compiler/linker settings - set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) + if(WIN32) + # avoid linking errors, cf https://stackoverflow.com/questions/12540970/how-to-make-gtest-build-mdd-instead-of-mtd-by-default-using-cmake + set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) + endif() FetchContent_MakeAvailable(googletest) enable_testing() From 2dda52d3bce444f9e187832c7d587c283ce5f499 Mon Sep 17 00:00:00 2001 From: Daniel Savchenko Date: Fri, 2 Feb 2024 15:09:37 +0100 Subject: [PATCH 2/2] revert changes --- src/Unittests/CMakeLists.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Unittests/CMakeLists.txt b/src/Unittests/CMakeLists.txt index 8a026d23..4090f50f 100644 --- a/src/Unittests/CMakeLists.txt +++ b/src/Unittests/CMakeLists.txt @@ -73,16 +73,14 @@ endif() if (OPENMESH_BUILD_UNIT_TESTS) # Fetch Gtest from github include(FetchContent) - FetchContent_Declare( googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.10.0 + GIT_TAG f8d7d77c06936315286eb55f8de22cd23c188571 # v1.14.0 + #FIND_PACKAGE_ARGS NAMES GTest ) - if(WIN32) - # avoid linking errors, cf https://stackoverflow.com/questions/12540970/how-to-make-gtest-build-mdd-instead-of-mtd-by-default-using-cmake - set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - endif() + # For Windows: Prevent overriding the parent project's compiler/linker settings + set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) FetchContent_MakeAvailable(googletest) enable_testing()