Merge 9ad5037 into 3326937

srz-zumix · Sep 6, 2020 · 30b007c · 30b007c
2 parents 3326937 + 9ad5037
commit 30b007c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -115,6 +115,8 @@ stages:
       - job: visual_studio_test
         strategy:
           matrix:
+            NO_EXCEPTION_HANDLER:
+              CMAKE_OPTIONS: -Dbuild_gtest_samples=ON -Dbuild_no_exceptions=ON
             USE_EXPERIMENTAL:
               CMAKE_OPTIONS: -Dbuild_gtest_samples=ON -Dbuild_use_experimental=ON
         pool:

diff --git a/include/internal/iutest_compiler.hpp b/include/internal/iutest_compiler.hpp
@@ -798,7 +798,11 @@
 // c++
 //! has exceptions
 #if !defined(IUTEST_HAS_EXCEPTIONS)
-#  if   defined(_MSC_VER) || defined(__BORLANDC__)
+#  if   defined(_MSC_VER)
+#    if defined(_CPPUNWIND) && _CPPUNWIND
+#      define IUTEST_HAS_EXCEPTIONS 1
+#    endif
+#  elif defined(__BORLANDC__)
 #    ifndef _HAS_EXCEPTIONS
 #      define _HAS_EXCEPTIONS       1
 #    endif

diff --git a/projects/cmake/internal_utils.cmake b/projects/cmake/internal_utils.cmake
@@ -58,7 +58,7 @@ macro(config_compiler_and_linker)
     set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32")
     set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN")
     set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1")
-    set(cxx_no_exception_flags "-D_HAS_EXCEPTIONS=0")
+    set(cxx_no_exception_flags "-EHs-c- -D_HAS_EXCEPTIONS=0")
     set(cxx_no_rtti_flags "-GR-")
   elseif (CMAKE_COMPILER_IS_GNUCXX)
     set(cxx_base_flags "-Wall -Wshadow")
@@ -96,7 +96,11 @@ macro(config_compiler_and_linker)
   set(cxx_exception "${CMAKE_CXX_FLAGS} ${cxx_base_flags} ${cxx_exception_flags}")
   set(cxx_no_exception
     "${CMAKE_CXX_FLAGS} ${cxx_base_flags} ${cxx_no_exception_flags}")
-  set(cxx_default "${cxx_exception}")
+  if (build_no_exceptions)
+    set(cxx_default "${cxx_no_exception}")
+  else()
+    set(cxx_default "${cxx_exception}")
+  endif()
   set(cxx_no_rtti "${cxx_default} ${cxx_no_rtti_flags}")
   set(cxx_use_own_tuple "${cxx_default}")