diff options
| author | chausner <15180557+chausner@users.noreply.github.com> | 2021-09-28 05:53:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 20:53:48 -0700 |
| commit | 1ea790bb36e7922f6feb612261d92126a506897e (patch) | |
| tree | d833d32a09d1a8e771825610bedaf2bd3b07d391 /ports/draco/fix-compile-error-uwp.patch | |
| parent | bcdda2e5a22031f7f9f2d46ac754a692af916d67 (diff) | |
| download | vcpkg-1ea790bb36e7922f6feb612261d92126a506897e.tar.gz vcpkg-1ea790bb36e7922f6feb612261d92126a506897e.zip | |
[draco] Update to 1.4.1 (#20352)
* Update draco to 1.4.1
* Update CI baseline
* add vcpkg_fixup_pkgconfig function
* update version
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
Diffstat (limited to 'ports/draco/fix-compile-error-uwp.patch')
| -rw-r--r-- | ports/draco/fix-compile-error-uwp.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ports/draco/fix-compile-error-uwp.patch b/ports/draco/fix-compile-error-uwp.patch index b098fd715..63f672d81 100644 --- a/ports/draco/fix-compile-error-uwp.patch +++ b/ports/draco/fix-compile-error-uwp.patch @@ -2,7 +2,7 @@ diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc index 6e42a58..3c302b9 100644 --- a/src/draco/io/parser_utils.cc +++ b/src/draco/io/parser_utils.cc -@@ -160,7 +160,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) { +@@ -152,7 +152,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) { if (!ParseUnsignedInt(buffer, &v)) { return false; } @@ -17,14 +17,14 @@ 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() +@@ -70,6 +70,10 @@ draco_set_build_definitions() + draco_set_cxx_flags() + draco_generate_features_h() +if (MSVC) + add_compile_options(/wd4996) +endif() + - # Generate a version file containing repository info. - include(FindGit) - find_package(Git) + # Draco source file listing variables. + list(APPEND draco_attributes_sources + "${draco_src_root}/attributes/attribute_octahedron_transform.cc" |