From 6aefaf4d1aa624e89a3e4ea91fa973c5ababe585 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 15 Aug 2024 07:00:27 +0800 Subject: [PATCH] [restc-cpp] Add C++17 option to fix build error (#40418) Co-authored-by: Jon --- ports/restc-cpp/portfile.cmake | 5 +++-- ports/restc-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/restc-cpp.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/restc-cpp/portfile.cmake b/ports/restc-cpp/portfile.cmake index f5ff81041b..481c8569a4 100644 --- a/ports/restc-cpp/portfile.cmake +++ b/ports/restc-cpp/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jgaa/restc-cpp - REF v0.10.0 + REF "v${VERSION}" SHA512 0f74d825d3958810c270748c2810953fe394d0bf1f147d81b9177803e29a86c702715d5995c5966c4fe671b7689f26d9a0fad4e82d111277bbd3ddce1a68f73a HEAD_REF master PATCHES @@ -26,6 +26,7 @@ vcpkg_cmake_configure( -DRESTC_CPP_WITH_EXAMPLES=OFF -DRESTC_CPP_WITH_UNIT_TESTS=OFF -DRESTC_CPP_WITH_FUNCTIONALT_TESTS=OFF + -DRESTC_CPP_USE_CPP17=ON ${FEATURE_OPTIONS} ) @@ -37,4 +38,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/restc-cpp/vcpkg.json b/ports/restc-cpp/vcpkg.json index 65dd07e822..79630ffa67 100644 --- a/ports/restc-cpp/vcpkg.json +++ b/ports/restc-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "restc-cpp", "version-semver": "0.10.0", - "port-version": 2, + "port-version": 3, "description": "Modern C++ REST Client library", "homepage": "https://github.com/jgaa/restc-cpp", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 5ec19076ab..013a330a8c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7798,7 +7798,7 @@ }, "restc-cpp": { "baseline": "0.10.0", - "port-version": 2 + "port-version": 3 }, "restclient-cpp": { "baseline": "2022-02-09", diff --git a/versions/r-/restc-cpp.json b/versions/r-/restc-cpp.json index a038212eda..ad7878461f 100644 --- a/versions/r-/restc-cpp.json +++ b/versions/r-/restc-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d19c339247ae8eab33e5141cfe985b86c440dcde", + "version-semver": "0.10.0", + "port-version": 3 + }, { "git-tree": "2e57eacc4df802951e1ae319194becc2bc3e0fb4", "version-semver": "0.10.0",