[draco] Update to v1.5.6 (#31220)

* [draco] Update to v1.5.6

* [draco] Update baseline

* [draco] Fix pkgconfig

* [draco] Update version

* [draco] Use VERSION variable for git ref

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>

* [draco] Revert line ending change

* [draco] Update version

---------

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
This commit is contained in:
Connor Broyles 2023-05-05 13:55:33 -04:00 committed by GitHub
parent 60e2c07d20
commit defe7b7fb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 35 additions and 17 deletions

View File

@ -1,10 +1,10 @@
diff --git a/cmake/draco_targets.cmake b/cmake/draco_targets.cmake diff --git a/cmake/draco_targets.cmake b/cmake/draco_targets.cmake
index f96dbb1..179b9f9 100644 index c8c79f5..1cec5b8 100644
--- a/cmake/draco_targets.cmake --- a/cmake/draco_targets.cmake
+++ b/cmake/draco_targets.cmake +++ b/cmake/draco_targets.cmake
@@ -103,9 +103,6 @@ macro(draco_add_executable) @@ -111,9 +111,6 @@ macro(draco_add_executable)
add_executable(${exe_NAME} ${exe_SOURCES})
target_compile_features(${exe_NAME} PRIVATE cxx_std_11) target_compile_features(${exe_NAME} PUBLIC cxx_std_11)
- if(NOT EMSCRIPTEN) - if(NOT EMSCRIPTEN)
- set_target_properties(${exe_NAME} PROPERTIES VERSION ${DRACO_VERSION}) - set_target_properties(${exe_NAME} PROPERTIES VERSION ${DRACO_VERSION})
@ -12,16 +12,16 @@ index f96dbb1..179b9f9 100644
if(exe_OUTPUT_NAME) if(exe_OUTPUT_NAME)
set_target_properties(${exe_NAME} PROPERTIES OUTPUT_NAME ${exe_OUTPUT_NAME}) set_target_properties(${exe_NAME} PROPERTIES OUTPUT_NAME ${exe_OUTPUT_NAME})
@@ -340,14 +337,6 @@ macro(draco_add_library) @@ -364,14 +361,6 @@ macro(draco_add_library)
set_target_properties(${lib_NAME} PROPERTIES PREFIX "") set_target_properties(${lib_NAME} PROPERTIES PREFIX "")
endif() endif()
- if(NOT EMSCRIPTEN) - if(NOT EMSCRIPTEN)
- # VERSION and SOVERSION as necessary - # VERSION and SOVERSION as necessary
- if((lib_TYPE STREQUAL BUNDLE OR lib_TYPE STREQUAL SHARED) AND NOT MSVC) - if((lib_TYPE STREQUAL BUNDLE OR lib_TYPE STREQUAL SHARED) AND NOT MSVC)
- set_target_properties(${lib_NAME} - set_target_properties(
- PROPERTIES VERSION ${DRACO_SOVERSION} SOVERSION - ${lib_NAME} PROPERTIES VERSION ${DRACO_SOVERSION}
- ${DRACO_SOVERSION_MAJOR}) - SOVERSION ${DRACO_SOVERSION_MAJOR})
- endif() - endif()
- endif() - endif()

View File

@ -1,18 +1,17 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0362420..2b09073 100644 index a93267d..3a3ccf7 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -86,6 +86,10 @@ draco_set_cxx_flags() @@ -85,6 +85,9 @@ draco_set_cxx_flags()
draco_set_exe_linker_flags() draco_set_exe_linker_flags()
draco_generate_features_h() draco_generate_features_h()
+if (MSVC) +if (MSVC)
+ add_compile_options(/wd4996) + add_compile_options(/wd4996)
+endif() +endif()
+
# Draco source file listing variables. # Draco source file listing variables.
list(APPEND draco_attributes_sources list(
"${draco_src_root}/attributes/attribute_octahedron_transform.cc" APPEND draco_attributes_sources
diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc
index 378de73..be7e032 100644 index 378de73..be7e032 100644
--- a/src/draco/io/parser_utils.cc --- a/src/draco/io/parser_utils.cc

View File

@ -0,0 +1,13 @@
diff --git a/cmake/draco.pc.template b/cmake/draco.pc.template
index 050219c..2886bfc 100644
--- a/cmake/draco.pc.template
+++ b/cmake/draco.pc.template
@@ -1,6 +1,6 @@
Name: @PROJECT_NAME@
Description: Draco geometry de(com)pression library.
Version: @DRACO_VERSION@
-Cflags: -I@includes_path@
-Libs: -L@libs_path@ -ldraco
+Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@
+Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -ldraco
Libs.private: @CMAKE_THREAD_LIBS_INIT@

View File

@ -3,12 +3,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO google/draco REPO google/draco
REF 1.5.3 REF "${VERSION}"
SHA512 8575ea78e0d8025facddbd42453b0251387f4e31eb0854135e050fc26aaf0d28ed30ccc3f93578fdc6cdb50369c2ef735291f1f5fb60238b289e0ee019446e1d SHA512 d4bc48aeac23aba377d1770a46e6676cb01596a436493385fb0c4ef9ba3f0fae42027232131a3d438250909aff4311353e114925753d045cc585af42660be0b1
HEAD_REF master HEAD_REF master
PATCHES PATCHES
fix-compile-error-uwp.patch fix-compile-error-uwp.patch
fix-uwperror.patch fix-uwperror.patch
fix-pkgconfig.patch
disable-symlinks.patch disable-symlinks.patch
) )

View File

@ -1,6 +1,6 @@
{ {
"name": "draco", "name": "draco",
"version": "1.5.3", "version": "1.5.6",
"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.", "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", "homepage": "https://github.com/google/draco",
"license": "Apache-2.0", "license": "Apache-2.0",

View File

@ -2157,7 +2157,7 @@
"port-version": 1 "port-version": 1
}, },
"draco": { "draco": {
"baseline": "1.5.3", "baseline": "1.5.6",
"port-version": 0 "port-version": 0
}, },
"drlibs": { "drlibs": {

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "bed378402e689e540a924f99869f7134d74bbdfb",
"version": "1.5.6",
"port-version": 0
},
{ {
"git-tree": "b4f39e03fdf47c2c1e9a945b362ed52ec098a354", "git-tree": "b4f39e03fdf47c2c1e9a945b362ed52ec098a354",
"version": "1.5.3", "version": "1.5.3",