[parson] Update to 2022-11-13 (#27885)

* update to latest

* update version

* fix patch
This commit is contained in:
Mengna Li 2022-11-19 05:05:16 +08:00 committed by GitHub
parent 9dee4648cb
commit 66b18ed3de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 52 additions and 72 deletions

View File

@ -6,7 +6,7 @@ index b9c62e8..edf5847 100644
#Copyright (c) Microsoft. All rights reserved.
#Licensed under the MIT license. See LICENSE file in the project root for full license information.
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-parson)
+find_dependency(parson)
+find_dependency(uamqp)
+find_dependency(uhttp)
+find_dependency(umqtt)
@ -47,33 +47,3 @@ index d05d654..5872c8d 100644
../common_dt_e2e/iothubclient_common_dt_e2e.h
)
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index 22e24f851..7dc30beba 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -37,5 +37,8 @@ endif()
if(NOT ${use_installed_dependencies})
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/parson)
else()
- find_package(parson REQUIRED CONFIG)
+ find_package(unofficial-parson REQUIRED CONFIG)
+ if(NOT TARGET parson)
+ add_library(parson ALIAS unofficial::parson::parson)
+ endif()
endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b72bd41ed..b2812f1fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -242,7 +242,10 @@ endif()
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/deps)
if(${use_installed_dependencies})
- find_package(parson REQUIRED CONFIG)
+ find_package(unofficial-parson REQUIRED CONFIG)
+ if(NOT TARGET parson)
+ add_library(parson ALIAS unofficial::parson::parson)
+ endif()
endif()
include_directories(${MACRO_UTILS_INC_FOLDER})

View File

@ -1,6 +1,7 @@
{
"name": "azure-iot-sdk-c",
"version-date": "2022-09-15",
"port-version": 1,
"description": "A C99 SDK for connecting devices to Microsoft Azure IoT services",
"homepage": "https://github.com/Azure/azure-iot-sdk-c",
"license": "MIT",

View File

@ -1,19 +0,0 @@
cmake_minimum_required(VERSION 3.5)
project(parson C)
add_library(parson parson.c)
target_include_directories(parson PUBLIC $<INSTALL_INTERFACE:include>)
install(TARGETS parson
EXPORT unofficial-parson-targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
install(
EXPORT unofficial-parson-targets
FILE unofficial-parson-config.cmake
NAMESPACE unofficial::parson::
DESTINATION share/unofficial-parson
)

View File

@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d656fa..993e859 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,6 @@ install(
EXPORT parsonTargets
FILE parsonConfig.cmake
NAMESPACE parson::
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ DESTINATION share/${PROJECT_NAME}
)

View File

@ -1,31 +1,26 @@
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
message("parson only supports static linkage")
set(VCPKG_LIBRARY_LINKAGE "static")
endif()
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO kgabis/parson
REF 102a4467e10c77ffcfde1d233798780acd719cc5 # accessed on 2020-09-14
SHA512 8498e667525a0f08881c4041877194bf68926af34c9f0cbd9fd3d9538c31e0ad1ab1c083fbee48423f4ffd99f46e25918928c43585206237c8f723e5e47b17b7
REF 1314bf8ad6f22edd2feb9d8c867756f41db21f2a # accessed on 2022-11-13
SHA512 5f6003caea40c093dedfbd85dfe6d33202708b37b59ad9eeb815a5d287dd7b37f3522d3bf35fb718eab13260bb0c129b691703f04b9f1c3dbe7bef4b494928be
HEAD_REF master
PATCHES
fix-cmake-files-path.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
)
vcpkg_install_cmake()
vcpkg_cmake_install()
file(COPY ${SOURCE_PATH}/parson.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-parson TARGET_PATH share/unofficial-parson)
vcpkg_cmake_config_fixup()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL
${SOURCE_PATH}/LICENSE
DESTINATION ${CURRENT_PACKAGES_DIR}/share/parson RENAME copyright)
DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
vcpkg_copy_pdbs()

View File

@ -1,6 +1,17 @@
{
"name": "parson",
"version-string": "2020-09-14",
"port-version": 1,
"description": "a lighweight json library written in C"
"version-date": "2022-11-13",
"description": "a lightweight json library written in C",
"homepage": "https://github.com/kgabis/parson",
"license": "MIT",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9cb7368d6494ab01b085cad166bb7fef06cd14e7",
"version-date": "2022-09-15",
"port-version": 1
},
{
"git-tree": "2a47653f79ed3d0017784d96142716554dd4de95",
"version-date": "2022-09-15",

View File

@ -358,7 +358,7 @@
},
"azure-iot-sdk-c": {
"baseline": "2022-09-15",
"port-version": 0
"port-version": 1
},
"azure-kinect-sensor-sdk": {
"baseline": "1.4.1",
@ -5689,8 +5689,8 @@
"port-version": 1
},
"parson": {
"baseline": "2020-09-14",
"port-version": 1
"baseline": "2022-11-13",
"port-version": 0
},
"pbc": {
"baseline": "0.5.14",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a154132abe66de11955af5aaca44575373120acd",
"version-date": "2022-11-13",
"port-version": 0
},
{
"git-tree": "40671b05e30f32cdc83003036e882ed4b1f7b44d",
"version-string": "2020-09-14",