diff options
| author | Xiaoyi Zhang <zhangxy988@gmail.com> | 2018-02-27 21:06:07 (GMT) |
|---|---|---|
| committer | Xiaoyi Zhang <zhangxy988@gmail.com> | 2018-02-27 21:06:07 (GMT) |
| commit | e1622337aebe390301fd30ec9c3fee5f31de71e8 (patch) | |
| tree | fbb470f9d5a55bd6b1a4da5f87e898265645e52d /googletest/cmake | |
| parent | 62be6f34d1755752f8d1d170ccda6c8a9d277233 (diff) | |
| parent | 576d689c19f053be212ce1e18b02d342976baa29 (diff) | |
| download | googletest-e1622337aebe390301fd30ec9c3fee5f31de71e8.zip googletest-e1622337aebe390301fd30ec9c3fee5f31de71e8.tar.gz googletest-e1622337aebe390301fd30ec9c3fee5f31de71e8.tar.bz2 | |
Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into variant_matcherrefs/pull/1482/head
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 2c97833..3277cc5 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") |