[draco] Update to 1.4.3 (#21121)

* Update draco to 1.4.3

* Update CI baseline

* Disable symlinks

* Update git-tree hash

Co-authored-by: chausner <chausner@users.noreply.github.com>
This commit is contained in:
chausner 2021-11-04 20:57:01 +01:00 committed by GitHub
parent d24ca043c5
commit 591c558fda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 67 additions and 21 deletions

View File

@ -0,0 +1,31 @@
diff --git a/cmake/draco_targets.cmake b/cmake/draco_targets.cmake
index f2acc72..fb8ce4a 100644
--- a/cmake/draco_targets.cmake
+++ b/cmake/draco_targets.cmake
@@ -102,10 +102,6 @@ macro(draco_add_executable)
add_executable(${exe_NAME} ${exe_SOURCES})
- if(NOT EMSCRIPTEN)
- set_target_properties(${exe_NAME} PROPERTIES VERSION ${DRACO_VERSION})
- endif()
-
if(exe_OUTPUT_NAME)
set_target_properties(${exe_NAME} PROPERTIES OUTPUT_NAME ${exe_OUTPUT_NAME})
endif()
@@ -337,15 +333,6 @@ macro(draco_add_library)
set_target_properties(${lib_NAME} PROPERTIES PREFIX "")
endif()
- if(NOT EMSCRIPTEN)
- # VERSION and SOVERSION as necessary
- if((lib_TYPE STREQUAL BUNDLE OR lib_TYPE STREQUAL SHARED) AND NOT MSVC)
- set_target_properties(${lib_NAME}
- PROPERTIES VERSION ${DRACO_SOVERSION} SOVERSION
- ${DRACO_SOVERSION_MAJOR})
- endif()
- endif()
-
if(BUILD_SHARED_LIBS AND (MSVC OR WIN32))
if(lib_TYPE STREQUAL SHARED)
target_compile_definitions(${lib_NAME} PRIVATE "DRACO_BUILDING_DLL=1")

View File

@ -3,36 +3,36 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/draco
REF 1.4.1
SHA512 55B8AF74552987220FB23580F6B167E4610A1341BC36117B6D235C05E126A79981F93787ACB90210127DC779B3134A1D9CC8D6697B1286459F233BF660B890BC
REF 1.4.3
SHA512 f2220d5e84a4ca2d14c6bbc3dca0a2ed5c988849d3a98ce3dea910efe005e0ccdff06677d782cdb1673db9e158905aa91a9305432dc5621e8947b2d90f5996d3
HEAD_REF master
PATCHES
fix-compile-error-uwp.patch
fix-uwperror.patch
disable-symlinks.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake)
vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake)
vcpkg_fixup_pkgconfig()
# Install tools and plugins
file(GLOB TOOLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.exe")
if(TOOLS)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/draco)
file(COPY ${TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/draco)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
# Install tools and plugins
vcpkg_copy_tools(
TOOL_NAMES
draco_encoder
draco_decoder
AUTO_CLEAN
)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
vcpkg_copy_pdbs()
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,6 +1,16 @@
{
"name": "draco",
"version": "1.4.1",
"version": "1.4.3",
"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",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@ -1889,7 +1889,7 @@
"port-version": 1
},
"draco": {
"baseline": "1.4.1",
"baseline": "1.4.3",
"port-version": 0
},
"drlibs": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e7d67016c671b628353196ef4138cfd91feb2d33",
"version": "1.4.3",
"port-version": 0
},
{
"git-tree": "3289b6aa2981d3fb169f35ca384608b514210401",
"version": "1.4.1",