From 9b2e5d31addb1079125e656362ddb9e0e8b1c14d Mon Sep 17 00:00:00 2001 From: Arseniy Obolenskiy Date: Sat, 6 Sep 2025 21:19:32 +0200 Subject: [PATCH] Simplify and unify gtest build - Disable gmock - Pass existing cmake variables if available - Use `-Dgtest_force_shared_crt` only for gtest instead of the whole project --- cmake/configure.cmake | 4 ---- cmake/gtest.cmake | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cmake/configure.cmake b/cmake/configure.cmake index d02098445..57f6334a5 100644 --- a/cmake/configure.cmake +++ b/cmake/configure.cmake @@ -1,7 +1,3 @@ -if(MSVC) - option(gtest_force_shared_crt "" TRUE) -endif(MSVC) - if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release") endif(NOT CMAKE_BUILD_TYPE) diff --git a/cmake/gtest.cmake b/cmake/gtest.cmake index b7dbca393..aa5624985 100644 --- a/cmake/gtest.cmake +++ b/cmake/gtest.cmake @@ -11,10 +11,11 @@ ExternalProject_Add( -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER} -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} - -DCMAKE_CXX_STANDARD_REQUIRED=ON + -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_C_FLAGS=-w -DCMAKE_CXX_FLAGS=-w + -DBUILD_GMOCK=OFF $<$:-Dgtest_force_shared_crt=ON> BUILD_COMMAND "${CMAKE_COMMAND}" --build