From 2a43ce0cd54119a29882caa43c16f06592417ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Rombauts?= Date: Thu, 17 Aug 2023 16:27:21 +0200 Subject: [PATCH] Don't set SQLITECPP_USE_STATIC_RUNTIME by default when building with unit tests Use gtest_force_shared_crt to force googletest to link against the default dynamic C++ runtime --- CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6325910..51c1eb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,10 +36,10 @@ if (MSVC) # disable Visual Studio warnings for fopen() used in the example add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Flags for linking with multithread static C++ runtime, required by internal googletest - # inspired from Zlib licensed glfw https://github.com/glfw/glfw/blob/master/CMakeLists.txt - option(SQLITECPP_USE_STATIC_RUNTIME "Use MSVC static runtime (default for internal googletest)." ${SQLITECPP_BUILD_TESTS}) + option(SQLITECPP_USE_STATIC_RUNTIME "Use MSVC static runtime (default for internal googletest)." FALSE) if (SQLITECPP_USE_STATIC_RUNTIME) message(STATUS "Linking against multithread static C++ runtime") + # inspired from Zlib licensed glfw https://github.com/glfw/glfw/blob/master/CMakeLists.txt foreach (flag CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE @@ -55,6 +55,11 @@ if (MSVC) string(REGEX REPLACE "/MD" "/MT" ${flag} "${${flag}}") endforeach() + else (SQLITECPP_USE_STATIC_RUNTIME) + if (SQLITECPP_BUILD_TESTS) + message(STATUS "Force googletest to link against dynamic C++ runtime") + set(gtest_force_shared_crt ON CACHE BOOL "Use shared (DLL) run-time lib even when Google Test is built as static lib.") + endif (SQLITECPP_BUILD_TESTS) endif (SQLITECPP_USE_STATIC_RUNTIME) # MSVC versions prior to 2015 are not supported anymore by SQLiteC++ 3.x if (MSVC_VERSION LESS 1900) # OR MSVC_TOOLSET_VERSION LESS 140)