[drogon] fix drogon_ctl command not found error (#32870)

* fix: patch to use find_program for drogon_ctl

* update drogon port version
This commit is contained in:
Mohsen Mirkarimi 2023-08-03 20:50:34 +03:30 committed by GitHub
parent 83f77efbd1
commit b3d05b2f8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 42 additions and 6 deletions

View File

@ -0,0 +1,30 @@
diff --git a/cmake/DrogonUtilities.cmake b/cmake/DrogonUtilities.cmake
index 7cb9799..5462572 100644
--- a/cmake/DrogonUtilities.cmake
+++ b/cmake/DrogonUtilities.cmake
@@ -3,6 +3,7 @@
# [TRUE to use_path_as_namespace] [prefixed namespace])
# ##############################################################################
function(drogon_create_views arg)
+ find_program(DROGON_CTL_COMMAND drogon_ctl REQUIRED)
if(ARGC LESS 3)
message(STATUS "arguments error when calling drogon_create_views")
return()
@@ -39,7 +40,7 @@ function(drogon_create_views arg)
set(ns "")
endif()
add_custom_command(OUTPUT ${ARGV2}/${outputFile}.h ${ARGV2}/${outputFile}.cc
- COMMAND drogon_ctl
+ COMMAND ${DROGON_CTL_COMMAND}
ARGS
create
view
@@ -55,7 +56,7 @@ function(drogon_create_views arg)
else()
get_filename_component(classname ${cspFile} NAME_WE)
add_custom_command(OUTPUT ${ARGV2}/${classname}.h ${ARGV2}/${classname}.cc
- COMMAND drogon_ctl
+ COMMAND ${DROGON_CTL_COMMAND}
ARGS
create
view

View File

@ -5,10 +5,11 @@ vcpkg_from_github(
SHA512 381b4b576d316e55690dc0531cfeaeee4c0e00ce540a502e1c1870eea9a463d00d7e4bc9a354c459e5fbc6da5f046757f07ff2077bb3a9603f97f448f2d17ea2
HEAD_REF master
PATCHES
vcpkg.patch
drogon_config.patch
fix_gcc13.patch #https://github.com/drogonframework/drogon/pull/1563
deps_redis.patch
001_vcpkg.patch
002_drogon_config.patch
003_fix_gcc13.patch #https://github.com/drogonframework/drogon/pull/1563
004_deps_redis.patch
005_drogon_ctl.patch
)
vcpkg_check_features(

View File

@ -1,7 +1,7 @@
{
"name": "drogon",
"version": "1.8.4",
"port-version": 3,
"port-version": 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/",

View File

@ -2214,7 +2214,7 @@
},
"drogon": {
"baseline": "1.8.4",
"port-version": 3
"port-version": 4
},
"dstorage": {
"baseline": "1.2.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7f8d8eadd014bf7d28bfff57e3e11e211fa8c4ae",
"version": "1.8.4",
"port-version": 4
},
{
"git-tree": "dde2eb171931557ecf9c74459cceb6a7b1d7ce9a",
"version": "1.8.4",