[alembic] update to 1.8.5 (#31456)

* alembic update to 1.8.5

* update version

* fix line break

* update version

* fix line break

* update version

* delete debug patch

* update version

* fix line break

* update version
This commit is contained in:
jim wang 2023-05-19 02:23:27 +08:00 committed by GitHub
parent d707c55758
commit cdb77f1b5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 35 deletions

View File

@ -1,19 +0,0 @@
Workaround for https://github.com/alembic/alembic/issues/309
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,14 +125,6 @@ IF (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
ENDIF()
-# Set some debug vs opt flags
-if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug" AND NOT MSVC)
- add_definitions(-Wall -Werror -Wextra -Wno-unused-parameter -Wno-deprecated)
- if((CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7.0) OR
- CMAKE_CXX_COMPILER_ID MATCHES "CLANG")
- add_definitions( -Wno-error=implicit-fallthrough)
- endif()
-endif()
IF (NOT ${WINDOWS})
SET(EXTERNAL_MATH_LIBS "-lm")

View File

@ -1,8 +1,9 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 860a8be..ee0f4f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,7 +73,7 @@ option(DOCS_PATH
@@ -74,7 +74,7 @@ option(DOCS_PATH
# Set static/dynamic build options
SET(LIB_TYPE STATIC)
-SET(RUNTIME_INSTALL_DIR lib)
@ -11,13 +12,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
SET(ARCHIVE_INSTALL_DIR lib)
IF (ALEMBIC_SHARED_LIBS)
diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
index 25e760c..9acac61 100644
--- a/lib/Alembic/CMakeLists.txt
+++ b/lib/Alembic/CMakeLists.txt
@@ -78,12 +78,11 @@ option(DOCS_PATH
${ZLIB_LIBRARY}
)
-SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs")
@@ -87,9 +87,9 @@ TARGET_LINK_LIBRARIES(Alembic
SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE STRING "Where to install the Alembic libs")
INSTALL(TARGETS Alembic
EXPORT AlembicTargets
- LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
@ -26,6 +25,6 @@ diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
+ LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR}
+ ARCHIVE DESTINATION ${ARCHIVE_INSTALL_DIR}
+ RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR})
#-******************************************************************************
# PACKAGE EXPORTS

View File

@ -3,12 +3,11 @@ vcpkg_buildpath_length_warning(37)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO alembic/alembic
REF 1.8.3
SHA512 0049c72d93e66e12d704d27e7ba36cd9c718667f2ce4f7baa1bee1613ed88ba53abea98f457e14f7f2144cb353810a4108d26c7dd1a1543ec2af576272f19036
REF "${VERSION}"
SHA512 89a480970eb09893112bf650011ede852205d1fa3718680a3983392bbcf3eb3f22f4ec01f42d12bfcaf655ce43d7d6f583b764ec03f4c5a84023359502b3636e
HEAD_REF master
PATCHES
fix-runtime-destination.patch
disable-warnings-as-error.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ALEMBIC_SHARED_LIBS)
@ -24,6 +23,7 @@ vcpkg_cmake_configure(
-DALEMBIC_SHARED_LIBS=${ALEMBIC_SHARED_LIBS}
-DUSE_TESTS=OFF
${FEATURE_OPTIONS}
-DALEMBIC_DEBUG_WARNINGS_AS_ERRORS=OFF
)
vcpkg_cmake_install()
@ -46,4 +46,4 @@ vcpkg_copy_tools(
)
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")

View File

@ -1,7 +1,6 @@
{
"name": "alembic",
"version": "1.8.3",
"port-version": 1,
"version": "1.8.5",
"description": "Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.",
"homepage": "https://alembic.io/",
"supports": "!(windows & x86) & !uwp",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5cb4b9d32a6098f48e3d0a75ddd7eaae7a7df085",
"version": "1.8.5",
"port-version": 0
},
{
"git-tree": "16bef528ef38e7426a333739878188d9ca909bc5",
"version": "1.8.3",

View File

@ -69,8 +69,8 @@
"port-version": 7
},
"alembic": {
"baseline": "1.8.3",
"port-version": 1
"baseline": "1.8.5",
"port-version": 0
},
"aliyun-oss-c-sdk": {
"baseline": "3.10.0",