diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-09-27 17:59:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-27 17:59:45 -0700 |
| commit | 460b6d5f20c46385f323a5ccc436e8d85059e1b4 (patch) | |
| tree | 2dfe37d7f319ef75e0a420a579bc35509a3c7b54 /ports/draco/fix-compile-error-uwp.patch | |
| parent | a8c046b4833e6d89325f795c1ae189e4e2e26733 (diff) | |
| download | vcpkg-460b6d5f20c46385f323a5ccc436e8d85059e1b4.tar.gz vcpkg-460b6d5f20c46385f323a5ccc436e8d85059e1b4.zip | |
[dimcli/draco/refprop-headers/coolprop] Update version (#13679)
* [manyports] Update version 5
* [coolprop] Update version
* Update CONTROL
* Update ports/refprop-headers/CONTROL
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/draco/fix-compile-error-uwp.patch')
| -rw-r--r-- | ports/draco/fix-compile-error-uwp.patch | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/ports/draco/fix-compile-error-uwp.patch b/ports/draco/fix-compile-error-uwp.patch index df0b1df22..b098fd715 100644 --- a/ports/draco/fix-compile-error-uwp.patch +++ b/ports/draco/fix-compile-error-uwp.patch @@ -1,11 +1,11 @@ diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc -index 0a22ba1..9862949 100644 +index 6e42a58..3c302b9 100644 --- a/src/draco/io/parser_utils.cc +++ b/src/draco/io/parser_utils.cc -@@ -150,7 +150,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) { - uint32_t v; - if (!ParseUnsignedInt(buffer, &v)) +@@ -160,7 +160,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) { + if (!ParseUnsignedInt(buffer, &v)) { return false; + } - *value = (sign < 0) ? -v : v; + if (sign < 0) + v *= -1; @@ -13,3 +13,18 @@ index 0a22ba1..9862949 100644 return true; } +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7e79da7..c4d9880 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -153,6 +153,10 @@ if(ENABLE_EXTRA_SPEED) + endif() + endif() + ++if (MSVC) ++ add_compile_options(/wd4996) ++endif() ++ + # Generate a version file containing repository info. + include(FindGit) + find_package(Git) |