mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 19:25:27 +08:00
[drogon] Fix building errors on Windows and Linux (#13007)
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
This commit is contained in:
parent
238f626248
commit
7b285940a8
@ -1,5 +1,5 @@
|
||||
Source: drogon
|
||||
Version: v1.0.0-beta20
|
||||
Version: v1.0.0-beta21
|
||||
Homepage: https://github.com/an-tao/drogon
|
||||
Description:Drogon: A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows
|
||||
Build-Depends: trantor, zlib, jsoncpp, libmariadb, libpq, sqlite3, brotli
|
||||
Build-Depends: trantor, zlib, jsoncpp, libmariadb, libpq, sqlite3, brotli, libuuid (!windows)
|
||||
|
@ -1,20 +0,0 @@
|
||||
diff --git a/drogon_ctl/CMakeLists.txt b/drogon_ctl/CMakeLists.txt
|
||||
index bbc01fe..99500f0 100755
|
||||
--- a/drogon_ctl/CMakeLists.txt
|
||||
+++ b/drogon_ctl/CMakeLists.txt
|
||||
@@ -40,13 +40,13 @@ if(WIN32)
|
||||
target_link_libraries(drogon_ctl PRIVATE ws2_32 Rpcrt4)
|
||||
endif(WIN32)
|
||||
message(STATUS "bin:" ${INSTALL_BIN_DIR})
|
||||
-install(TARGETS drogon_ctl RUNTIME DESTINATION ${INSTALL_BIN_DIR})
|
||||
+install(TARGETS drogon_ctl RUNTIME DESTINATION tools/drogon)
|
||||
if(WIN32)
|
||||
set(CTL_FILE $<TARGET_FILE:drogon_ctl>)
|
||||
add_custom_command(TARGET drogon_ctl POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
-DCTL_FILE=${CTL_FILE}
|
||||
- -DINSTALL_BIN_DIR=${INSTALL_BIN_DIR}
|
||||
+ -DINSTALL_BIN_DIR=tools/drogon
|
||||
-P
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/CopyDlls.cmake)
|
||||
else(WIN32)
|
@ -1,12 +1,11 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO an-tao/drogon
|
||||
REF v1.0.0-beta20
|
||||
SHA512 10da2765df24848964358ea3f6a8843664d142bfd1d276649438c5d79ad88f98467ac742d3ff23e9fda93b89ab9568b2ecea8c3ee4d527d0b6b4a5892025e24e
|
||||
REF v1.0.0-beta21
|
||||
SHA512 bacd3c0d20c9d5eb22e6c872c8bea6865a6beb93d83165e117b11a30b7fffd65de48838b599cda81043e7ae1394a9d13390910baa4b84d8cfad3050f152a4c36
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
vcpkg.patch
|
||||
drogon_ctl_install.patch
|
||||
pg.patch
|
||||
)
|
||||
|
||||
@ -20,8 +19,10 @@ vcpkg_configure_cmake(
|
||||
vcpkg_install_cmake()
|
||||
|
||||
# Fix CMake files
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
|
||||
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Drogon)
|
||||
# Copy drogon_ctl
|
||||
vcpkg_copy_tools(TOOL_NAMES drogon_ctl
|
||||
AUTO_CLEAN)
|
||||
# # Remove includes in debug
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
@ -34,4 +35,3 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${
|
||||
# Copy pdb files
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/drogon)
|
||||
|
Loading…
x
Reference in New Issue
Block a user