[drogon] Update to 1.7.5 (#23227)

This commit is contained in:
An Tao 2022-02-24 06:38:18 +08:00 committed by GitHub
parent 982cf2bf18
commit f3a68220a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 68 deletions

View File

@ -1,19 +0,0 @@
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()

View File

@ -1,28 +0,0 @@
diff --git a/cmake_modules/FindUUID.cmake b/cmake_modules/FindUUID.cmake
index 31bad4c..2532829 100755
--- a/cmake_modules/FindUUID.cmake
+++ b/cmake_modules/FindUUID.cmake
@@ -76,18 +76,18 @@ else(UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
/opt/lib
/usr/freeware/lib64)
- if(NOT UUID_LIBRARY AND BSD)
+ if(NOT UUID_LIBRARY AND (BSD OR APPLE))
set(UUID_LIBRARY "")
- endif(NOT UUID_LIBRARY AND BSD)
+ endif()
set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR})
set(UUID_LIBRARIES ${UUID_LIBRARY})
if(UUID_INCLUDE_DIRS)
- if(BSD OR UUID_LIBRARIES)
+ if((BSD OR APPLE) OR UUID_LIBRARIES)
set(UUID_FOUND TRUE)
- endif(BSD OR UUID_LIBRARIES)
- endif(UUID_INCLUDE_DIRS)
+ endif()
+ endif()
if(UUID_FOUND)
if(NOT UUID_FIND_QUIETLY)

View File

@ -1,15 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO an-tao/drogon
REF v1.7.4
SHA512 ee2458e584beb1dc0e437cbdbdea211762aeac60acc7104d1a7bf6aa7629f70d0cc71a45978b27917373599806f6f183ec2494be7ec00c74694888a31e5fd5d1
REF v1.7.5
SHA512 8be77961026d13b55dbfcc2e43972b4fb8f1cd9a6bfb8098d5bdfc8b60ff67c2d3ede4bdb5815614a8233dc184cbf3aa363a9d33eed96b9f748544e20b15f2c7
HEAD_REF master
PATCHES
vcpkg.patch
drogon_config.patch
static-brotli.patch
fs.patch
mac-system-uuid.patch
use-libmariadb.patch
)

View File

@ -1,23 +1,23 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70b2a0d..7f35626 100755
index 146d2b8..f180498 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -363,10 +363,11 @@ endif (BUILD_POSTGRESQL)
@@ -360,12 +360,8 @@ endif (BUILD_POSTGRESQL)
if (BUILD_MYSQL)
# Find mysql, only mariadb client liberary is supported
- find_package(MySQL)
+ find_package(unofficial-libmariadb CONFIG REQUIRED)
+ set(MySQL_FOUND TRUE)
if (MySQL_FOUND)
message(STATUS "Ok! We find the mariadb!")
# Find mysql, only mariadb client library is supported
- find_package(MySQL QUIET)
find_package(unofficial-libmariadb QUIET)
- if (MySQL_FOUND)
- target_link_libraries(${PROJECT_NAME} PRIVATE MySQL_lib)
+ target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::libmariadb)
set(DROGON_SOURCES
${DROGON_SOURCES}
orm_lib/src/mysql_impl/MysqlConnection.cc
- set(DROGON_FOUND_MYSQL TRUE)
- elseif (unofficial-libmariadb_FOUND)
+ if (unofficial-libmariadb_FOUND)
target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::libmariadb)
set(DROGON_FOUND_MYSQL TRUE)
endif ()
diff --git a/cmake/templates/DrogonConfig.cmake.in b/cmake/templates/DrogonConfig.cmake.in
index 72d9622..026f1a5 100644
index 199cfb9..a3fbde0 100644
--- a/cmake/templates/DrogonConfig.cmake.in
+++ b/cmake/templates/DrogonConfig.cmake.in
@@ -25,7 +25,7 @@ if(@SQLite3_FOUND@)

View File

@ -1,7 +1,6 @@
{
"name": "drogon",
"version-semver": "1.7.4",
"port-version": 2,
"version-semver": "1.7.5",
"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/",

View File

@ -1913,8 +1913,8 @@
"port-version": 0
},
"drogon": {
"baseline": "1.7.4",
"port-version": 2
"baseline": "1.7.5",
"port-version": 0
},
"dtl": {
"baseline": "1.19",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a66c2bb4632ab86589f1cabed26607d510ae2eba",
"version-semver": "1.7.5",
"port-version": 0
},
{
"git-tree": "b7be1868461c479ff45609e892bc5de9adf42258",
"version-semver": "1.7.4",