Merge pull request #837 from Farwaykorse/fix/disable_exceptions

Restore disabling of exceptions for MSVC in "no exception tests"
microsoft · Jan 17, 2020 · 7ba7f87 · 7ba7f87
2 parents d976d41 + 95730a8
commit 7ba7f87
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -133,9 +133,11 @@ endforeach(flag_var)
 # please try to keep entries ordered =)
 add_library(gsl_tests_config_noexcept INTERFACE)
 if(MSVC) # MSVC or simulating MSVC
+    target_compile_definitions(gsl_tests_config_noexcept INTERFACE
+        _HAS_EXCEPTIONS=0 # disable exceptions in the Microsoft STL
+    )
     target_compile_options(gsl_tests_config_noexcept INTERFACE
         ${GSL_CPLUSPLUS_OPT}
-        /EHsc
         /W4
         /WX
         $<$<CXX_COMPILER_ID:MSVC>: