Skip to content
Snippets Groups Projects
Commit ed65571c authored by Adrien Béraud's avatar Adrien Béraud Committed by Adrien Béraud
Browse files

contrib: update restinio to 0.7.2

GitLab: #1016
Change-Id: I570a6a03d5fe041a06a8a96cfaea24e5ef4b02f8
parent 75e7aa49
Branches
No related tags found
No related merge requests found
...@@ -8,3 +8,4 @@ i686* ...@@ -8,3 +8,4 @@ i686*
apple* apple*
build* build*
msvc* msvc*
tarballs/*
\ No newline at end of file
3abf5c5f9258b35763d38773b2c21eb73d4887f1594d4b01c9a4db641dfeb34d9b254ca25d2d5a920f820e5337ebd22b41c80b231952797f022b2e26891d0fd5 restinio-bbaa034dbcc7555ce67df0f8a1475591a7441733.tar.gz 3847830d974b3d1bbda482e3f39d3182c3c7d5956bcec223c565da5d856f5367cdb35b9579b474f3053c92b5bbe319206d84a3bb51df528583ee230c5598429b restinio-0.7.2.tar.bz2
dev/restinio/CMakeLists.txt | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/dev/restinio/CMakeLists.txt b/dev/restinio/CMakeLists.txt
index df2ecdf..e5f5489 100644
--- a/dev/restinio/CMakeLists.txt
+++ b/dev/restinio/CMakeLists.txt
@@ -10,11 +10,9 @@ add_library(${RESTINIO} INTERFACE)
add_library(restinio::restinio ALIAS ${RESTINIO})
IF (${CMAKE_VERSION} VERSION_LESS "3.8.0")
- set_target_properties(${RESTINIO} PROPERTIES
- CXX_STANDARD 14
- CXX_STANDARD_REQUIRED YES
- CXX_EXTENSIONS NO
- )
+ set (CMAKE_CXX_STANDARD 17)
+ set (CMAKE_CXX_STANDARD_REQUIRED on)
+ set (CMAKE_CXX_EXTENSIONS off)
ELSE ()
target_compile_features(${RESTINIO} INTERFACE cxx_std_14)
ENDIF ()
# RESTINIO # RESTINIO
RESTINIO_VERSION := bbaa034dbcc7555ce67df0f8a1475591a7441733 RESTINIO_VERSION := 0.7.2
RESTINIO_URL := https://github.com/aberaud/restinio/archive/$(RESTINIO_VERSION).tar.gz RESTINIO_URL := https://github.com/Stiffstream/restinio/releases/download/v.$(RESTINIO_VERSION)/restinio-$(RESTINIO_VERSION).tar.bz2
EXPECTED_LITE_URL := https://raw.githubusercontent.com/martinmoene/expected-lite/master/include/nonstd/expected.hpp
PKGS += restinio PKGS += restinio
ifeq ($(call need_pkg,'restinio'),) ifeq ($(call need_pkg,'restinio'),)
...@@ -17,23 +18,27 @@ endif ...@@ -17,23 +18,27 @@ endif
ifneq ($(call need_pkg,"fmt >= 5.3.0"),) ifneq ($(call need_pkg,"fmt >= 5.3.0"),)
DEPS_restinio += fmt DEPS_restinio += fmt
endif endif
DEPS_restinio += http_parser DEPS_restinio += llhttp
RESTINIO_CMAKECONF = -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF -DRESTINIO_INSTALL_SAMPLES=OFF \ RESTINIO_CMAKECONF = -DRESTINIO_TEST=Off -DRESTINIO_SAMPLE=Off -DRESTINIO_BENCHMARK=Off \
-DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF -DRESTINIO_FIND_DEPS=ON \ -DRESTINIO_WITH_SOBJECTIZER=Off -DRESTINIO_DEP_STANDALONE_ASIO=system -DRESTINIO_DEP_LLHTTP=system \
-DRESTINIO_ALLOW_SOBJECTIZER=OFF -DRESTINIO_USE_BOOST_ASIO=none \ -DRESTINIO_DEP_FMT=system -DRESTINIO_DEP_EXPECTED_LITE=system \
-DZLIB_LIBRARY="$(PREFIX)/lib" -DZLIB_INCLUDE_DIR="$(PREFIX)/include" -DZLIB_LIBRARY="$(PREFIX)/lib" -DZLIB_INCLUDE_DIR="$(PREFIX)/include"
$(TARBALLS)/restinio-$(RESTINIO_VERSION).tar.gz: $(TARBALLS)/restinio-$(RESTINIO_VERSION).tar.bz2:
$(call download,$(RESTINIO_URL)) $(call download,$(RESTINIO_URL))
.sum-restinio: restinio-$(RESTINIO_VERSION).tar.gz $(TARBALLS)/expected.hpp:
$(call download,$(EXPECTED_LITE_URL))
restinio: restinio-$(RESTINIO_VERSION).tar.gz .sum-restinio: restinio-$(RESTINIO_VERSION).tar.bz2
restinio: restinio-$(RESTINIO_VERSION).tar.bz2 expected.hpp
$(UNPACK) $(UNPACK)
#$(APPLY) $(SRC)/restinio/cmake.patch
$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR)
$(MOVE) $(MOVE)
mkdir -p $(PREFIX)/include/nonstd
cp $(TARBALLS)/expected.hpp $(PREFIX)/include/nonstd/expected.hpp
.restinio: restinio .sum-restinio .restinio: restinio .sum-restinio
cd $</dev && $(HOSTVARS) $(CMAKE) $(RESTINIO_CMAKECONF) . cd $</dev && $(HOSTVARS) $(CMAKE) $(RESTINIO_CMAKECONF) .
......
*.tar.*
*.zip
*.h
*.tgz
*-git/
.wget-hsts
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment