diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-02-28 12:18:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-28 12:18:16 -0800 |
| commit | 0a5c27a82324a33e7c37ddcf93b7b9d9513d5f03 (patch) | |
| tree | e30f5f822d5146579a970221d38cbb57996f705c | |
| parent | 2cb2e4d718be303e502b04b759b2108c47aaca31 (diff) | |
| download | vcpkg-0a5c27a82324a33e7c37ddcf93b7b9d9513d5f03.tar.gz vcpkg-0a5c27a82324a33e7c37ddcf93b7b9d9513d5f03.zip | |
Revert "Update 0002-Fix-z7-override.patch (#5490)" (#5493)
This reverts commit 2cb2e4d718be303e502b04b759b2108c47aaca31.
| -rw-r--r-- | ports/gtest/0002-Fix-z7-override.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ports/gtest/0002-Fix-z7-override.patch b/ports/gtest/0002-Fix-z7-override.patch index cf875084c..c8de56d09 100644 --- a/ports/gtest/0002-Fix-z7-override.patch +++ b/ports/gtest/0002-Fix-z7-override.patch @@ -1,13 +1,13 @@ 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 +++ 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) # 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") + if (MSVC_VERSION LESS 1400) # 1400 is Visual Studio 2005 + # Suppress spurious warnings MSVC 7.1 sometimes issues. + # Forcing value to bool. |