From b17216a4525568f2781265f56a7887f37478d912 Mon Sep 17 00:00:00 2001 From: denchat <19730041+denchat@users.noreply.github.com> Date: Thu, 9 May 2019 15:56:10 +0700 Subject: [PATCH] Receive FMT_MSVC_EH from user --- test/CMakeLists.txt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index eded0aec..f13794ef 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -29,9 +29,19 @@ if (MSVC) if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") # Disable MSVC warnings of POSIX functions. target_compile_options(gmock PUBLIC -Wno-deprecated-declarations) - # Mirroring MSVC cl default - target_compile_options(gmock PUBLIC /EHsc) endif () + # Insert FMT_MSVC_EH if user provides. + # if not, default to /EHsc in clang target msvc. + if (FMT_MSVC_EH) + set(FMT_CUSTOM_MSVC_EH ${FMT_MSVC_EH}) + endif () + else () + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") ) + set(FMT_CUSTOM_MSVC_EH /EHsc) + else () + set(FMT_CUSTOM_MSVC_EH) + endif () + target_compile_options(fmt PRIVATE ${FMT_CUSTOM_MSVC_EH}) endif () # GTest doesn't detect with clang.