mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 12:06:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[drogon] Update to 1.8.4 (#30311)

Browse Source 
* [drogon] Update to 1.8.4

* Fix vcpkg.patch

* fix

---------

Co-authored-by: Monica <v-liumonica@microsoft.com>
This commit is contained in:
An Tao 2023-03-25 12:43:03 +08:00 committed by GitHub
parent bc671eb900
commit 749fcd6c61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/drogon/portfile.cmake
View File

@ -1,8 +1,8 @@
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO an-tao/drogon REPO an-tao/drogon
REF v1.8.2 REF v1.8.4
SHA512 f50252a59951570c87cc1254b1954ef275ee7b2a5cac229aba98b49f34f9f73314d2db9df0abc92efdfeab565f6c1ee14080e049d370384e3398b8c27f5519b7 SHA512 381b4b576d316e55690dc0531cfeaeee4c0e00ce540a502e1c1870eea9a463d00d7e4bc9a354c459e5fbc6da5f046757f07ff2077bb3a9603f97f448f2d17ea2
HEAD_REF master HEAD_REF master
PATCHES PATCHES
vcpkg.patch vcpkg.patch
@ -30,6 +30,7 @@ vcpkg_cmake_configure(
-DBUILD_SHARED_LIBS=${BUILD_DROGON_SHARED} -DBUILD_SHARED_LIBS=${BUILD_DROGON_SHARED}
-DBUILD_EXAMPLES=OFF -DBUILD_EXAMPLES=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON
-DUSE_SUBMODULE=OFF
${FEATURE_OPTIONS} ${FEATURE_OPTIONS}
MAYBE_UNUSED_VARIABLES MAYBE_UNUSED_VARIABLES
CMAKE_DISABLE_FIND_PACKAGE_Boost CMAKE_DISABLE_FIND_PACKAGE_Boost

3
ports/drogon/vcpkg.json
View File

@ -1,7 +1,6 @@
{ {
"name": "drogon", "name": "drogon",
"version": "1.8.2", "version": "1.8.4",
"port-version": 1,
"description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows", "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows",
"homepage": "https://github.com/an-tao/drogon", "homepage": "https://github.com/an-tao/drogon",
"documentation": "https://drogon.docsforge.com/master/overview/", "documentation": "https://drogon.docsforge.com/master/overview/",

35
ports/drogon/vcpkg.patch
View File

@ -1,19 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4406362..0595ab8 100755
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -120,9 +120,9 @@ if (WIN32) @@ -360,11 +360,10 @@ endif (NOT WIN32)
PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/mman-win32>)
endif (WIN32)
-add_subdirectory(trantor)
+find_package(Trantor CONFIG REQUIRED)
-target_link_libraries(${PROJECT_NAME} PUBLIC trantor)
+target_link_libraries(${PROJECT_NAME} PUBLIC Trantor::Trantor)
if(${CMAKE_SYSTEM_NAME} STREQUAL "Haiku")
target_link_libraries(${PROJECT_NAME} PRIVATE network)
@@ -316,11 +316,10 @@ endif (NOT WIN32)
if (BUILD_POSTGRESQL) if (BUILD_POSTGRESQL)
# find postgres # find postgres
@ -24,12 +13,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
- target_link_libraries(${PROJECT_NAME} PRIVATE pg_lib) - target_link_libraries(${PROJECT_NAME} PRIVATE pg_lib)
+ find_package(PostgreSQL REQUIRED) + find_package(PostgreSQL REQUIRED)
+ if(PostgreSQL_FOUND) + if(PostgreSQL_FOUND)
+ set(pg_FOUND true) + set(pg_FOUND true)
+ target_link_libraries(${PROJECT_NAME} PRIVATE PostgreSQL::PostgreSQL) + target_link_libraries(${PROJECT_NAME} PRIVATE PostgreSQL::PostgreSQL)
set(DROGON_SOURCES set(DROGON_SOURCES
${DROGON_SOURCES} ${DROGON_SOURCES}
orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc) orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc
@@ -348,7 +348,7 @@ if (BUILD_POSTGRESQL) @@ -394,7 +393,7 @@ if (BUILD_POSTGRESQL)
${private_headers} ${private_headers}
orm_lib/src/postgresql_impl/PgConnection.h) orm_lib/src/postgresql_impl/PgConnection.h)
endif (libpq_supports_batch) endif (libpq_supports_batch)
@ -38,16 +27,20 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
endif (BUILD_POSTGRESQL) endif (BUILD_POSTGRESQL)
if (BUILD_MYSQL) if (BUILD_MYSQL)
diff --git a/drogon_ctl/CMakeLists.txt b/drogon_ctl/CMakeLists.txt
index 9f2f1e7..09871f8 100755 index 9f2f1e7..76bd2ec 100755
--- a/drogon_ctl/CMakeLists.txt --- a/drogon_ctl/CMakeLists.txt
+++ b/drogon_ctl/CMakeLists.txt +++ b/drogon_ctl/CMakeLists.txt
@@ -19,7 +19,7 @@ add_executable(_drogon_ctl @@ -19,7 +19,11 @@ add_executable(_drogon_ctl
target_link_libraries(_drogon_ctl ${PROJECT_NAME}) target_link_libraries(_drogon_ctl ${PROJECT_NAME})
if (WIN32 AND BUILD_SHARED_LIBS) if (WIN32 AND BUILD_SHARED_LIBS)
set(DROGON_FILE $<TARGET_FILE:drogon>) set(DROGON_FILE $<TARGET_FILE:drogon>)
- set(TRANTOR_FILE $<TARGET_FILE:trantor>) - set(TRANTOR_FILE $<TARGET_FILE:trantor>)
+ set(TRANTOR_FILE $<TARGET_FILE:Trantor::Trantor>) + if (USE_SUBMODULE)
+ set(TRANTOR_FILE $<TARGET_FILE:trantor>)
+ else()
+ set(TRANTOR_FILE $<TARGET_FILE:Trantor::Trantor>)
+ endif()
add_custom_command(TARGET _drogon_ctl POST_BUILD add_custom_command(TARGET _drogon_ctl POST_BUILD
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
-DCTL_FILE=${DROGON_FILE} -DCTL_FILE=${DROGON_FILE}

4
versions/baseline.json
View File

@ -2133,8 +2133,8 @@
"port-version": 0 "port-version": 0
}, },
"drogon": { "drogon": {
"baseline": "1.8.2", "baseline": "1.8.4",
"port-version": 1 "port-version": 0
}, },
"dstorage": { "dstorage": {
"baseline": "1.1.0", "baseline": "1.1.0",

5
versions/d-/drogon.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "92af14d325c1fce661625e6adef2cf633acb5a37",
"version": "1.8.4",
"port-version": 0
},
{ {
"git-tree": "670f02828b60f7a11c6b7a7feff0396d6cec4483", "git-tree": "670f02828b60f7a11c6b7a7feff0396d6cec4483",
"version": "1.8.2", "version": "1.8.2",