summaryrefslogtreecommitdiffstats
path: root/googletest/cmake
diff options
context:
space:
mode:
authorPeter Collingbourne <pcc@google.com>2018-01-25 22:14:33 (GMT)
committerPeter Collingbourne <pcc@google.com>2018-01-25 22:15:43 (GMT)
commitf9155307911ecdbf344d153adc577e6bb0e0a67c (patch)
tree4eabfabfcf48a1f82fd76c7efaab9ae244b61f67 /googletest/cmake
parentb3a2048beb0f8d6cbb2d5c95e7f639780eff5805 (diff)
downloadgoogletest-f9155307911ecdbf344d153adc577e6bb0e0a67c.zip
googletest-f9155307911ecdbf344d153adc577e6bb0e0a67c.tar.gz
googletest-f9155307911ecdbf344d153adc577e6bb0e0a67c.tar.bz2
Pass -EHs-c- to disable exceptions with MSVC.
Diffstat (limited to 'googletest/cmake')
-rw-r--r--googletest/cmake/internal_utils.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
index c54bc94..acffe0c 100644
--- a/googletest/cmake/internal_utils.cmake
+++ b/googletest/cmake/internal_utils.cmake
@@ -91,7 +91,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 -Werror")