diff options
| author | Peter Bright <drpizza@quiscalusmexicanus.org> | 2019-02-28 16:36:41 -0500 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-02-28 13:36:41 -0800 |
| commit | d236aa6f0a919b146bafd429865c9f77002f221f (patch) | |
| tree | 3140b93bbbaaa23966226077257cd3afd71c0d18 | |
| parent | a3a42ede13306284b0432b3cf2564638b02183f5 (diff) | |
| download | vcpkg-d236aa6f0a919b146bafd429865c9f77002f221f.tar.gz vcpkg-d236aa6f0a919b146bafd429865c9f77002f221f.zip | |
Fix debug format patch for gtest. (#5494)
* 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
| -rw-r--r-- | ports/gtest/0002-Fix-z7-override.patch | 10 | ||||
| -rw-r--r-- | ports/gtest/CONTROL | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ports/gtest/0002-Fix-z7-override.patch b/ports/gtest/0002-Fix-z7-override.patch index c8de56d09..cf875084c 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 777b91e..75a13c9 100644 +index 99725b7..3c25b0a 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake -@@ -55,7 +55,7 @@ macro(config_compiler_and_linker) +@@ -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") - if (MSVC_VERSION LESS 1400) # 1400 is Visual Studio 2005 - # Suppress spurious warnings MSVC 7.1 sometimes issues. - # Forcing value to bool. + 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") diff --git a/ports/gtest/CONTROL b/ports/gtest/CONTROL index 97e7f3f8c..2f93cea3e 100644 --- a/ports/gtest/CONTROL +++ b/ports/gtest/CONTROL @@ -1,3 +1,3 @@ Source: gtest -Version: 2019-01-04 +Version: 2019-01-04-1 Description: GoogleTest and GoogleMock testing frameworks. |