[qcbor] update to 1.6.1 (#50603)

This commit is contained in:
toge 2026-03-23 17:12:20 +09:00 committed by GitHub
parent 417f3541c7
commit 255b2989c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 33 deletions

View File

@ -1,28 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3537c27..bf569a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,8 @@ target_sources(qcbor
target_include_directories(qcbor
PUBLIC
- inc
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/qcbor>
PRIVATE
src
)
@@ -90,8 +91,13 @@ set_target_properties(
include(GNUInstallDirs)
install(
TARGETS qcbor
+ EXPORT unofficial-qcbor-targets
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/qcbor"
)
+install(EXPORT unofficial-qcbor-targets
+ FILE unofficial-qcbor-config.cmake
+ NAMESPACE unofficial::qcbor::
+ DESTINATION share/unofficial-qcbor)
if (NOT BUILD_QCBOR_TEST STREQUAL "OFF")
enable_testing()

View File

@ -7,10 +7,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO laurencelundblade/QCBOR
REF v${VERSION}
SHA512 cae2f9ed6554744733bed03e751179eee36988918b1f3fd42fe833650613b4ec06e260bb4a9e9663c8498b7b6dbb1369e7d5fd0c900c4767070ea3d94d4ddab7
SHA512 e0630f5e5bc614fb87dee6d8adb32d6ea2d896bdf7074df38cb99833b2136dd7417df72bbff2a4c935def19064ea15c0895e54af5aed2ae1328e64d224e12655
HEAD_REF master
PATCHES
install.patch
)
vcpkg_cmake_configure(
@ -20,6 +18,7 @@ vcpkg_cmake_configure(
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/qcbor)
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"

View File

@ -1,6 +1,6 @@
{
"name": "qcbor",
"version": "1.6",
"version": "1.6.1",
"description": "Comprehensive, powerful, commercial-quality CBOR encoder/ decoder that is still suited for small devices.",
"homepage": "https://github.com/laurencelundblade/QCBOR",
"license": "BSD-3-Clause",

View File

@ -7973,7 +7973,7 @@
"port-version": 4
},
"qcbor": {
"baseline": "1.6",
"baseline": "1.6.1",
"port-version": 0
},
"qcoro": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b8e3a6357f0f0a964ec1a26b218100006322f33d",
"version": "1.6.1",
"port-version": 0
},
{
"git-tree": "d83f385a35e1ecc084951ed10ad0cd72dbdb3278",
"version": "1.6",