mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-11 16:49:02 +08:00
d236aa6f0a
* Update 0002-Fix-z7-override.patch The current patch doesn't apply any more. This makes the same change to the right location. * Update CONTROL
14 lines
765 B
Diff
14 lines
765 B
Diff
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
|
|
index 99725b7..3c25b0a 100644
|
|
--- a/googletest/cmake/internal_utils.cmake
|
|
+++ b/googletest/cmake/internal_utils.cmake
|
|
@@ -66,7 +66,7 @@ macro(config_compiler_and_linker)
|
|
if (MSVC)
|
|
# Newlines inside flags variables break CMake's NMake generator.
|
|
# TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds.
|
|
- set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J -Zi")
|
|
+ set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J")
|
|
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")
|