diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-02-28 08:43:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 08:43:57 -0500 |
| commit | 66d71756a72ab31311de963fef23b74f15a6454b (patch) | |
| tree | 55065890101d41f9a36774cdd8032fc7bd9eb6d6 /googletest/cmake | |
| parent | ab46d9550bbacad1416552bb63432e59aaa73b31 (diff) | |
| parent | fe1144246e7ecae688608f7ed0a7ec1ee3e2d2af (diff) | |
| download | googletest-66d71756a72ab31311de963fef23b74f15a6454b.tar.gz googletest-66d71756a72ab31311de963fef23b74f15a6454b.tar.bz2 googletest-66d71756a72ab31311de963fef23b74f15a6454b.zip | |
Merge branch 'master' into debug-postfix
Diffstat (limited to 'googletest/cmake')
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index 01f9fe50..6448918f 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") |