[tinyply] update to 2.3.4 (#28992)

Co-authored-by: Guido Reina <guido.reina@informatik.uni-stuttgart.de>

Co-authored-by: Guido Reina <guido.reina@informatik.uni-stuttgart.de>
This commit is contained in:
moritz-h 2023-01-20 03:00:51 +01:00 committed by GitHub
parent 79c9b3074a
commit 0c17b838b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 48 deletions

View File

@ -1,27 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2bd9563..4d4d9fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,6 +50,8 @@ set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")
set(targets_export_name "${PROJECT_NAME}Targets")
set(namespace "")
+include(GNUInstallDirs)
+
write_basic_package_version_file(
"${version_config}"
VERSION ${PROJECT_VERSION}
@@ -63,9 +65,10 @@ configure_package_config_file(
# Install
install(TARGETS tinyply EXPORT ${targets_export_name}
- RUNTIME DESTINATION bin
- ARCHIVE DESTINATION lib
- LIBRARY DESTINATION lib)
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
install(FILES source/tinyply.h
DESTINATION include)

View File

@ -1,27 +1,23 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ddiakopoulos/tinyply
REF ca7b279fb6c9af931ffdaed96a3b11ca3ccd79ea
SHA512 d3adfe7cce849a14fd473cfd67baef0163d4e45ff32724516270d5893a18086f7ac17d87bda5c33381442766849b41516bd2c7757e97038c95af0c70d5f0edde
REF 40aa4a0ae9e9c203e11893f78b8bcaf8a50e65f0 # 2.3.4
SHA512 c99bdfcfbcbb13af2e662763f15771d7d5905267fb72ad93b40aad83785e8fbb48feb2359ce2542fe838fcb22a42f8a65cebd9c22963a383638be1ef0100269a
HEAD_REF master
PATCHES
# TODO: Remove this patch if https://github.com/ddiakopoulos/tinyply/pull/41 was accepted.
fix-cmake.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIB)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" TINYPLY_BUILD_SHARED)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DSHARED_LIB=${SHARED_LIB}
-DSHARED_LIB=${TINYPLY_BUILD_SHARED}
-DBUILD_TESTS=OFF
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
vcpkg_copy_pdbs()
@ -29,8 +25,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# License
file(READ "${SOURCE_PATH}/readme.md" readme_contents)
string(FIND "${readme_contents}" "License" license_line_pos)
string(SUBSTRING "${readme_contents}" ${license_line_pos} -1 license_contents)
string(FIND "${readme_contents}" "## License" license_pos)
string(SUBSTRING "${readme_contents}" ${license_pos} -1 license_contents)
file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "${license_contents}")
vcpkg_fixup_pkgconfig()
vcpkg_fixup_pkgconfig()

View File

@ -1,7 +1,17 @@
{
"name": "tinyply",
"version-string": "2020-05-22",
"port-version": 2,
"version": "2.3.4",
"description": "C++11 ply 3d mesh format importer & exporter",
"homepage": "https://github.com/ddiakopoulos/tinyply"
"homepage": "https://github.com/ddiakopoulos/tinyply",
"license": "BSD-2-Clause",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@ -7641,8 +7641,8 @@
"port-version": 0
},
"tinyply": {
"baseline": "2020-05-22",
"port-version": 2
"baseline": "2.3.4",
"port-version": 0
},
"tinyspline": {
"baseline": "0.4.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "79787577d8bf66af02aa77e9592552a6b0b0d8d0",
"version": "2.3.4",
"port-version": 0
},
{
"git-tree": "d4b7f95bfaf84b3013c43310740340d8951068f5",
"version-string": "2020-05-22",