diff --git a/ports/cpr/001-cpr-config.patch b/ports/cpr/001-cpr-config.patch index 9d666553d6..116321b0b2 100644 --- a/ports/cpr/001-cpr-config.patch +++ b/ports/cpr/001-cpr-config.patch @@ -1,15 +1,15 @@ diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt -index 66fc9eb..cc00c72 100644 +index 52787f5..aa3687d 100644 --- a/cpr/CMakeLists.txt +++ b/cpr/CMakeLists.txt -@@ -30,6 +30,10 @@ set_target_properties(cpr - VERSION ${${PROJECT_NAME}_VERSION} - SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR}) - +@@ -46,6 +46,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) - + diff --git a/ports/cpr/disable_werror.patch b/ports/cpr/disable_werror.patch index 48803b8e34..1fc1be1a0e 100644 --- a/ports/cpr/disable_werror.patch +++ b/ports/cpr/disable_werror.patch @@ -1,11 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index cb7c5f042..a5bc0b942 100644 +index 68b5343..fce2518 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -71,7 +71,7 @@ if(CPR_ENABLE_CPPCHECK) +@@ -103,7 +103,7 @@ if(CPR_ENABLE_CPPCHECK) include(cmake/cppcheck.cmake) endif() - + -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") +if (1) else() diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index bd106bb2bf..5b37ded453 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libcpr/cpr - REF 0445800cd2cace404ac37eb3e78ec5d1431a4f30 #1.10.2 - SHA512 77723343b2ce89a10b8622cf54127edd6639412e3d457caed31b4fa1d3935d79846b4be695c327001fc2228313591e320c9080dbf8c09e3b69265f81641b9973 + REF ${VERSION} + SHA512 aad193202ce0f24ed12c3992914c9a374f12fe9d84d5a375fc6e9ec6215cca6abf50372b71a11284aea039e00dd35b528fe5285667671dbb43b1b1fe4b7a74ef HEAD_REF master PATCHES 001-cpr-config.patch @@ -18,7 +18,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS -DCPR_BUILD_TESTS=OFF -DCPR_FORCE_USE_SYSTEM_CURL=ON ${FEATURE_OPTIONS} diff --git a/ports/cpr/vcpkg.json b/ports/cpr/vcpkg.json index 2f23201989..ea1f45ccc5 100644 --- a/ports/cpr/vcpkg.json +++ b/ports/cpr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpr", - "version-semver": "1.10.2+3", + "version-semver": "1.10.5", "description": "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.", "homepage": "https://github.com/libcpr/cpr", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 8a08a93697..29194bdf0d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1897,7 +1897,7 @@ "port-version": 0 }, "cpr": { - "baseline": "1.10.2+3", + "baseline": "1.10.5", "port-version": 0 }, "cpu-features": { diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index 18e5ea0427..63309fa152 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b734e9b119682ee4c98e2b4a127a8e29fc750844", + "version-semver": "1.10.5", + "port-version": 0 + }, { "git-tree": "96f05ba23a7dc5ba102ba451210b2c367669c1ad", "version-semver": "1.10.2+3",