From b5b1bdb20a5e8c6ef44b7e1d52f019365b5648af Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 29 Apr 2022 01:10:18 +0200 Subject: [PATCH] [libcbor] Update to 0.9.0 (#24453) * [libcbor] Update to 0.9.0 * version * Fix cmake config * version * remove cmake config * version --- ports/libcbor/portfile.cmake | 23 ++++++++++++----------- ports/libcbor/vcpkg.json | 12 +++++++++--- versions/baseline.json | 4 ++-- versions/l-/libcbor.json | 5 +++++ 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/ports/libcbor/portfile.cmake b/ports/libcbor/portfile.cmake index 252a708682..dfdd89a840 100644 --- a/ports/libcbor/portfile.cmake +++ b/ports/libcbor/portfile.cmake @@ -1,29 +1,30 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PJK/libcbor - REF v0.8.0 - SHA512 694d2d3a78d80072f96e0afb73590ca1f3572e41d2117330ef4313ed06271743b048d3ba3259c6ffe9a802d5e441379d0e54787d1d42fed08dc81ac4f06c6dbc + REF v0.9.0 + SHA512 710239f69d770212a82e933e59df1aba0fb3ec516ef6666a366f30a950565a52981b0d46ca7e0eea739f5785d79cc21fc19acd857a4a0b135f4f6aa3ef5fd3b0 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DWITH_TESTS=OFF -DWITH_EXAMPLES=OFF -DVCPKG_VERBOSE=ON - ) + -DSANITIZE=OFF + -DCBOR_CUSTOM_ALLOC=ON +) -vcpkg_build_cmake() -vcpkg_install_cmake() +vcpkg_cmake_build() +vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() # Add Cmake Packagefile -file(COPY ${CMAKE_CURRENT_LIST_DIR}/LibCborConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/LibCborConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libcbor/vcpkg.json b/ports/libcbor/vcpkg.json index 90c54499d8..25d7c8c5ea 100644 --- a/ports/libcbor/vcpkg.json +++ b/ports/libcbor/vcpkg.json @@ -1,7 +1,13 @@ { "name": "libcbor", - "version": "0.8.0", - "port-version": 1, + "version": "0.9.0", "description": "libcbor is a C library for parsing and generating CBOR, the general-purpose schema-less binary data format", - "homepage": "https://github.com/PJK/libcbor" + "homepage": "https://github.com/PJK/libcbor", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index a555098133..6b44d2eee2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3437,8 +3437,8 @@ "port-version": 2 }, "libcbor": { - "baseline": "0.8.0", - "port-version": 1 + "baseline": "0.9.0", + "port-version": 0 }, "libcds": { "baseline": "2.3.3", diff --git a/versions/l-/libcbor.json b/versions/l-/libcbor.json index 105e60aae4..eb5113b769 100644 --- a/versions/l-/libcbor.json +++ b/versions/l-/libcbor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e881ce93b52a9b16f4c03e4bed79c661def7631", + "version": "0.9.0", + "port-version": 0 + }, { "git-tree": "02d970a2dac8b0abb941a5b445f7e14afc9c1e49", "version": "0.8.0",