From 20d7fe5bb294bf1dd2329c19e49bafadfe0221d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Fri, 19 Jun 2020 01:26:36 +0200 Subject: [PATCH] [bitsery] Update to 5.1.0 version (#11912) * [bitsery] Update to 5.1.0 version * [bitsery] Remove unused patch --- ports/bitsery/CONTROL | 3 ++- ports/bitsery/fix-install-paths.patch | 16 ---------------- ports/bitsery/portfile.cmake | 11 +++++------ 3 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 ports/bitsery/fix-install-paths.patch diff --git a/ports/bitsery/CONTROL b/ports/bitsery/CONTROL index 93b2313027e..f219deb6eef 100644 --- a/ports/bitsery/CONTROL +++ b/ports/bitsery/CONTROL @@ -1,3 +1,4 @@ Source: bitsery -Version: 5.0.3 +Version: 5.1.0 Description: Header only C++ binary serialization library +Homepage: https://github.com/fraillt/bitsery diff --git a/ports/bitsery/fix-install-paths.patch b/ports/bitsery/fix-install-paths.patch deleted file mode 100644 index aa9130d8c57..00000000000 --- a/ports/bitsery/fix-install-paths.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8125a28..8daee28 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,9 +34,9 @@ install(TARGETS bitsery - install(EXPORT bitseryTargets - FILE "BitseryConfig.cmake" - NAMESPACE Bitsery:: -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/bitsery) -+ DESTINATION share/bitsery) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/BitseryConfigVersion.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/bitsery) -+ DESTINATION share/bitsery) - install(DIRECTORY include/bitsery - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - diff --git a/ports/bitsery/portfile.cmake b/ports/bitsery/portfile.cmake index d780bfe015a..1069ed64c60 100644 --- a/ports/bitsery/portfile.cmake +++ b/ports/bitsery/portfile.cmake @@ -1,12 +1,9 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fraillt/bitsery - REF d24dfe14f5a756c0f8ad3d56ae6949ecc2c99b2e # v5.0.3 - SHA512 0bd4c80632640b74387587f85ca6e174aed2efd1dc1d83dd682e26e10aa9ef9a98b5477cfb78aa9cbb1a4112fc12468d7072b5c237f32f6738158ba21cf2ea39 + REF d7876808195834f05fd84619b8f6b266e5c1d5bd + SHA512 ac2c6e3907f8ee8cf51070b3c00aab9071586510d8cfe30f9660ed5aa9918cd996c806b1db2b46d464f1d933fc41472e5406e63ba4814bdc37d2b0f1ad6e1083 HEAD_REF master - PATCHES fix-install-paths.patch ) vcpkg_configure_cmake( @@ -16,7 +13,9 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -# Delete redundant and empty directories +vcpkg_fixup_cmake_targets( CONFIG_PATH lib/cmake/${PORT} ) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)