Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[drogon] Update to 1.7.4 #22016

Merged
merged 3 commits into from
Dec 23, 2021
Merged

[drogon] Update to 1.7.4 #22016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c1774d
[drogon] Update to 1.7.4
Dec 14, 2021
503654c
add fs.patch
an-tao Dec 21, 2021
9642862
fix redis feature
Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 0 additions & 58 deletions ports/drogon/Fix-Drogon-not-building-caused-by-FindFilesystem-105.patch
View file
Open in desktop

This file was deleted.

19 changes: 19 additions & 0 deletions ports/drogon/fs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85e8ee7..c78dfc5 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,9 +192,11 @@ if(NEED_BOOST_FS)
else()
option(HAS_STD_FILESYSTEM_PATH "use std::filesystem" ON)
# HACK: Needed to be compiled on Yocto Linux
- get_property(CAN_LINK_FS TARGET std::filesystem PROPERTY INTERFACE_LINK_LIBRARIES SET)
- if ( CAN_LINK_FS )
- target_link_libraries(${PROJECT_NAME} PUBLIC std::filesystem)
+ if(TARGET std::filesystem)
+ get_property(CAN_LINK_FS TARGET std::filesystem PROPERTY INTERFACE_LINK_LIBRARIES SET)
+ if ( CAN_LINK_FS )
+ target_link_libraries(${PROJECT_NAME} PUBLIC std::filesystem)
+ endif()
endif()
endif()

6 changes: 3 additions & 3 deletions ports/drogon/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO an-tao/drogon
REF v1.7.3
SHA512 20146bf59898704f3b44778fa46e919d9124ef8a33eb1cfcce7f437507c20920829a0074e1c9e2493a1764b8a36b1a91b03f117fd78e740253b15d2146dca628
REF v1.7.4
SHA512 ee2458e584beb1dc0e437cbdbdea211762aeac60acc7104d1a7bf6aa7629f70d0cc71a45978b27917373599806f6f183ec2494be7ec00c74694888a31e5fd5d1
HEAD_REF master
PATCHES
vcpkg.patch
drogon_config.patch
static-brotli.patch
Fix-Drogon-not-building-caused-by-FindFilesystem-105.patch
fs.patch
)

vcpkg_check_features(
Expand Down
5 changes: 3 additions & 2 deletions ports/drogon/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "drogon",
"version-semver": "1.7.3",
"version-semver": "1.7.4",
"description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows",
"homepage": "https://github.com/an-tao/drogon",
"documentation": "https://drogon.docsforge.com/master/overview/",
Expand Down Expand Up @@ -72,7 +72,8 @@
"features": [
"orm"
]
}
},
"hiredis"
]
},
"sqlite3": {
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1905,7 +1905,7 @@
"port-version": 0
},
"drogon": {
"baseline": "1.7.3",
"baseline": "1.7.4",
"port-version": 0
},
"dtl": {
Expand Down
5 changes: 5 additions & 0 deletions versions/d-/drogon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "275d55a78bb61a79f0d66cd4f71e6b5892566666",
"version-semver": "1.7.4",
"port-version": 0
},
{
"git-tree": "35877feed401993a073b537fbd89f8b55b5be6d1",
"version-semver": "1.7.3",
Expand Down