diff --git a/ports/cpr/001-cpr-config.patch b/ports/cpr/001-cpr-config.patch index 0b972c9b04..7d8dc59335 100644 --- a/ports/cpr/001-cpr-config.patch +++ b/ports/cpr/001-cpr-config.patch @@ -1,32 +1,23 @@ diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt -index 8061a14..e8daf19 100644 +index d43fc1d..d6a3992 100644 --- a/cpr/CMakeLists.txt +++ b/cpr/CMakeLists.txt -@@ -21,6 +21,7 @@ add_library(cpr - - add_library(cpr::cpr ALIAS cpr) - -+target_include_directories(cpr PUBLIC $) - target_link_libraries(cpr PUBLIC CURL::libcurl) # todo should be private, but first dependencys in ssl_options need to be removed - - # Set version for shared libraries. -@@ -29,4 +30,18 @@ set_target_properties(cpr +@@ -29,6 +29,10 @@ set_target_properties(cpr + PROPERTIES VERSION ${${PROJECT_NAME}_VERSION} SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR}) - --install(TARGETS cpr) -+set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") -+install(TARGETS cpr -+ EXPORT ${TARGETS_EXPORT_NAME} -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ -+install( -+ EXPORT ${TARGETS_EXPORT_NAME} -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" -+) -+ ++ +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 diff --git a/ports/cpr/cprConfig.cmake b/ports/cpr/cprConfig.cmake deleted file mode 100644 index 85e433c4b9..0000000000 --- a/ports/cpr/cprConfig.cmake +++ /dev/null @@ -1,31 +0,0 @@ -####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() ####### -####### Any changes to this file will be overwritten by the next CMake run #### -####### The input file was Config.cmake.in ######## - -get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE) - -macro(set_and_check _var _file) - set(${_var} "${_file}") - if(NOT EXISTS "${_file}") - message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !") - endif() -endmacro() - -macro(check_required_components _NAME) - foreach(comp ${${_NAME}_FIND_COMPONENTS}) - if(NOT ${_NAME}_${comp}_FOUND) - if(${_NAME}_FIND_REQUIRED_${comp}) - set(${_NAME}_FOUND FALSE) - endif() - endif() - endforeach() -endmacro() - -#################################################################################### - -include("${CMAKE_CURRENT_LIST_DIR}/cprTargets.cmake") -check_required_components("cpr") - -include(CMakeFindDependencyMacro) -find_dependency(ZLIB REQUIRED) -find_dependency(CURL REQUIRED) diff --git a/ports/cpr/fix-uwp.patch b/ports/cpr/fix-uwp.patch deleted file mode 100644 index e91eb62b5f..0000000000 --- a/ports/cpr/fix-uwp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8575b2f..87de55c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,7 +46,7 @@ message(STATUS "=======================================================") - include(GNUInstallDirs) - include(FetchContent) - include(cmake/code_coverage.cmake) --include(cmake/sanitizer.cmake) -+#include(cmake/sanitizer.cmake) - include(cmake/gcc_analyze.cmake) - - # SSL diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index 49c6ef4dfc..56cd231216 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -1,22 +1,17 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if(VCPKG_TARGET_IS_UWP) - set(UWP_PATCH fix-uwp.patch) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libcpr/cpr - REF 1.6.2 - SHA512 77afd1dc81274aa1d37bf17abaf2614b63802f17fc08bdf8453d96d8fa2bd4b025511db9fadbde51160d7dde31a0363694422d3407ca9cdac3cd79b744a82888 + REF 1.7.0 + SHA512 8d48c808f037cbfa284be7de08214cd93277ea419982ef7c2e50fa012ad3901248f7c4b24156cd0e926c22cd0901cb588423ba06202cd8abfa15e5df07527d00 HEAD_REF master PATCHES 001-cpr-config.patch - ${UWP_PATCH} ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCPR_BUILD_TESTS=OFF -DCPR_FORCE_USE_SYSTEM_CURL=ON @@ -26,12 +21,12 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/cprConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/lib/cmake/cpr) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpr) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cpr/vcpkg.json b/ports/cpr/vcpkg.json index 27b1a87af4..5b9ac0d472 100644 --- a/ports/cpr/vcpkg.json +++ b/ports/cpr/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cpr", - "version-semver": "1.6.2", - "port-version": 1, + "version-semver": "1.7.0", "description": "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.", "homepage": "https://github.com/libcpr/cpr", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 229c1aa7b3..89d70c5605 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1613,8 +1613,8 @@ "port-version": 0 }, "cpr": { - "baseline": "1.6.2", - "port-version": 1 + "baseline": "1.7.0", + "port-version": 0 }, "cpu-features": { "baseline": "0.6.0", diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index 6221119812..91b060b5d5 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5adb33b62335c55231d3cd37e302c3487721a1d8", + "version-semver": "1.7.0", + "port-version": 0 + }, { "git-tree": "bc224c4615958fa1105b29a9d973555fda345de8", "version-semver": "1.6.2",