Skip to content

[drogon] Fix building errors on Windows and Linux #13007

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

Merged
BillyONeal merged 5 commits into from
Aug 21, 2020
Merged

[drogon] Fix building errors on Windows and Linux #13007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac900aa
[drogon] Fix building errors on Windows and Linux
an-tao Aug 19, 2020
982cd7d
Use the vcpkg_copy_tools()
an-tao Aug 20, 2020
a17afdc
Copy drogon_ctl before removing it
an-tao Aug 20, 2020
ee3e277
Add libuuid dependency
an-tao Aug 21, 2020
92fccad
Update ports/drogon/CONTROL
JackBoosY Aug 21, 2020
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
4 changes: 2 additions & 2 deletions ports/drogon/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
20 changes: 0 additions & 20 deletions ports/drogon/drogon_ctl_install.patch
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions ports/drogon/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)

Expand All @@ -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)
Comment thread
an-tao marked this conversation as resolved.
# 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")
Expand All @@ -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)