[cpr] update to 1.8.1 (#23984)

* [cpr] update to 1.8.1

* version

* license

* version

* Don't use curl default features

* version
This commit is contained in:
Thomas1664 2022-04-06 21:03:32 +02:00 committed by GitHub
parent 65ce468388
commit f34e5902f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 24 deletions

View File

@ -1,23 +1,15 @@
diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt
index d43fc1d..d6a3992 100644
index 66fc9eb..cc00c72 100644
--- a/cpr/CMakeLists.txt
+++ b/cpr/CMakeLists.txt
@@ -29,6 +29,10 @@ set_target_properties(cpr
PROPERTIES
@@ -30,6 +30,10 @@ set_target_properties(cpr
VERSION ${${PROJECT_NAME}_VERSION}
SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR})
+
+if (NOT DISABLE_INSTALL_HEADERS)
+ install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../include/cpr DESTINATION include)
+endif()
+
# Import GNU common install directory variables
include(GNUInstallDirs)
@@ -37,6 +41,7 @@ if(CPR_FORCE_USE_SYSTEM_CURL)
install(TARGETS cpr
EXPORT cprTargets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
# Include CMake helpers for package config files

View File

@ -3,30 +3,31 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libcpr/cpr
REF 1.7.2
SHA512 b2af6ab13a5dab435cc298c74ba79c365569c1e5ccfaffeea9dab0ad28cd918a198f83446761ac2e2101abb4be3a2f669f991e854e541851c1d250f34e16c414
REF 1.8.1
SHA512 f586b63ddbd9bd03e5c5aa385aad0d4f16f79847e1a14f6dc8a5e0cad4ed89e097ab83484c9ed19e034abf0d2eece13a7609652bc6a1a9caba43189cf0a782db
HEAD_REF master
PATCHES
001-cpr-config.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
ssl CPR_ENABLE_SSL
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DCPR_BUILD_TESTS=OFF
-DCPR_FORCE_USE_SYSTEM_CURL=ON
${FEATURE_OPTIONS}
OPTIONS_DEBUG
-DDISABLE_INSTALL_HEADERS=ON
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpr)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,8 +1,9 @@
{
"name": "cpr",
"version-semver": "1.7.2",
"version-semver": "1.8.1",
"description": "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.",
"homepage": "https://github.com/libcpr/cpr",
"license": "MIT",
"dependencies": [
{
"name": "curl",
@ -16,5 +17,26 @@
"name": "vcpkg-cmake-config",
"host": true
}
],
"default-features": [
"ssl"
],
"features": {
"ssl": {
"description": "Enable SSL support",
"dependencies": [
{
"name": "curl",
"default-features": false,
"features": [
"ssl"
]
},
{
"name": "openssl",
"platform": "linux"
}
]
}
}
}

View File

@ -1641,7 +1641,7 @@
"port-version": 0
},
"cpr": {
"baseline": "1.7.2",
"baseline": "1.8.1",
"port-version": 0
},
"cpu-features": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6a73ff58e720c30c96a1f7d12f98c9553a62a0d7",
"version-semver": "1.8.1",
"port-version": 0
},
{
"git-tree": "ada43417fa0d4613e92e3daafc717b83079d7959",
"version-semver": "1.7.2",