3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 12:08:06 +08:00
Code Issues Projects Releases Wiki Activity

Revert "Update 0002-Fix-z7-override.patch (#5490)" (#5493)

Browse Source 
This reverts commit 2cb2e4d718be303e502b04b759b2108c47aaca31.
This commit is contained in:
Victor Romero 2019-02-28 12:18:16 -08:00 committed by GitHub
parent 2cb2e4d718
commit 0a5c27a823
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ports/gtest/0002-Fix-z7-override.patch
View File

@ -1,13 +1,13 @@
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
index 99725b7..3c25b0a 100644 index 777b91e..75a13c9 100644
--- a/googletest/cmake/internal_utils.cmake --- a/googletest/cmake/internal_utils.cmake
+++ b/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake
@@ -66,7 +66,7 @@ macro(config_compiler_and_linker) @@ -55,7 +55,7 @@ macro(config_compiler_and_linker)
if (MSVC) if (MSVC)
# Newlines inside flags variables break CMake's NMake generator. # Newlines inside flags variables break CMake's NMake generator.
# TODO(vladl@google.com): Add -RTCs and -RTCu to debug builds. # 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 -Zi")
+ set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J") + set(cxx_base_flags "-GS -W4 -WX -wd4251 -wd4275 -nologo -J")
set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32") if (MSVC_VERSION LESS 1400) # 1400 is Visual Studio 2005
set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN") # Suppress spurious warnings MSVC 7.1 sometimes issues.
set(cxx_exception_flags "-EHsc -D_HAS_EXCEPTIONS=1") # Forcing value to bool.