[draco] update to v1.5.2 (#25568)

* [draco] update to v1.5.2

* update version

* add license

* overwrite version

* add commit

* overwrite version
This commit is contained in:
Frank 2022-07-06 02:06:41 +08:00 committed by GitHub
parent 7e245f8982
commit b095ea5584
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 20 deletions

View File

@ -1,5 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0362420..2b09073 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,6 +86,10 @@ draco_set_cxx_flags()
draco_set_exe_linker_flags()
draco_generate_features_h()
+if (MSVC)
+ add_compile_options(/wd4996)
+endif()
+
# Draco source file listing variables.
list(APPEND draco_attributes_sources
"${draco_src_root}/attributes/attribute_octahedron_transform.cc"
diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc
index 6e42a58..3c302b9 100644
index 378de73..be7e032 100644
--- a/src/draco/io/parser_utils.cc
+++ b/src/draco/io/parser_utils.cc
@@ -152,7 +152,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) {
@ -13,18 +28,3 @@ index 6e42a58..3c302b9 100644
return true;
}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e79da7..c4d9880 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,6 +70,10 @@ draco_set_build_definitions()
draco_set_cxx_flags()
draco_generate_features_h()
+if (MSVC)
+ add_compile_options(/wd4996)
+endif()
+
# Draco source file listing variables.
list(APPEND draco_attributes_sources
"${draco_src_root}/attributes/attribute_octahedron_transform.cc"

View File

@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/draco
REF 1.4.3
SHA512 f2220d5e84a4ca2d14c6bbc3dca0a2ed5c988849d3a98ce3dea910efe005e0ccdff06677d782cdb1673db9e158905aa91a9305432dc5621e8947b2d90f5996d3
REF bd1e8de7dd0596c2cbe5929cbe1f5d2257cd33db #v1.5.2
SHA512 6ae7e72a9f6f55563f8f612084d38bff1d2e10934fa84aad59538d323e59d205764ed364c753a55d80e9ffc7c17f542f6475b3f922edcb9085cbd83a942759d0
HEAD_REF master
PATCHES
fix-compile-error-uwp.patch

View File

@ -1,8 +1,9 @@
{
"name": "draco",
"version": "1.4.3",
"version": "1.5.2",
"description": " A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.",
"homepage": "https://github.com/google/draco",
"license": "Apache-2.0",
"dependencies": [
{
"name": "vcpkg-cmake",

View File

@ -1961,7 +1961,7 @@
"port-version": 0
},
"draco": {
"baseline": "1.4.3",
"baseline": "1.5.2",
"port-version": 0
},
"drlibs": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "39effb9dbafcf8540c1e99bacc9a2701ab9f94a1",
"version": "1.5.2",
"port-version": 0
},
{
"git-tree": "e7d67016c671b628353196ef4138cfd91feb2d33",
"version": "1.4.3",