[restinio] Update, fix exported config, fix build warnings (#30655)

* RESTinio updated to v.0.6.18.

* Baseline updated for RESTinio-0.6.18.

* [restinio] Fixup config requirements

* [restinio] Revise build/install

---------

Co-authored-by: Yauheni Akhotnikau <eao197@gmail.com>
This commit is contained in:
Kai Pastor 2023-04-05 06:34:28 +02:00 committed by GitHub
parent f67d3fed18
commit 76b55aaf7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 8 deletions

View File

@ -0,0 +1,12 @@
diff --git a/dev/restinio/cmake/restinio-config.cmake.in b/dev/restinio/cmake/restinio-config.cmake.in
index b8df667..02db4d8 100644
--- a/dev/restinio/cmake/restinio-config.cmake.in
+++ b/dev/restinio/cmake/restinio-config.cmake.in
@@ -1,3 +1,7 @@
@PACKAGE_INIT@
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-http-parser)
+find_dependency(fmt)
+
include(${CMAKE_CURRENT_LIST_DIR}/restinio-targets.cmake)

View File

@ -0,0 +1,10 @@
diff --git a/vcpkg/CMakeLists.txt b/vcpkg/CMakeLists.txt
index 2c36cda..be3d6ce 100644
--- a/vcpkg/CMakeLists.txt
+++ b/vcpkg/CMakeLists.txt
@@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.3)
+project(restinio-vcpkg CXX)
SET(CMAKE_CXX_STANDARD 14)
SET(CMAKE_CXX_STANDARD_REQUIRED ON)

View File

@ -1,17 +1,19 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO stiffstream/restinio
REF a5b668560138da42158511880470b19988566568 # v.0.6.17
SHA512 fc3cdab9c240ba30b5f4b800ec452442a38db93936d3f7557255e6e7e3176217413fa421afec8b155cfb498df5ca9fc48a74a8e9bf1903aa31c9824d26d9618c
REF "v.${VERSION}"
SHA512 8a535ebcdfb53ef9f669bbd007d11b6d95bae87b1a8b8403556910e4904483bfcaeb88fa2ee5522c9bef048a9276cbdb1fa15ec62b5bd158fc585b0e84cf046b
PATCHES
fix-cmake-config.diff
fix-project.diff
)
set(VCPKG_BUILD_TYPE release) # header-only
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/vcpkg"
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/restinio)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

View File

@ -1,6 +1,6 @@
{
"name": "restinio",
"version": "0.6.17",
"version": "0.6.18",
"description": "A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests.",
"homepage": "https://github.com/Stiffstream/restinio",
"license": "BSD-3-Clause",

View File

@ -6945,7 +6945,7 @@
"port-version": 0
},
"restinio": {
"baseline": "0.6.17",
"baseline": "0.6.18",
"port-version": 0
},
"rexo": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f749e69b703a537f74f52fcef9327950e7d56ea9",
"version": "0.6.18",
"port-version": 0
},
{
"git-tree": "7b285cfa0e43e1964ca4a91d2375516aa8121d79",
"version": "0.6.17",