3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 00:48:01 +08:00
Code Issues Projects Releases Wiki Activity

[drogon] Update to 1.1.0 (#14319)

Browse Source
This commit is contained in:
An Tao 2020-11-03 05:58:02 +08:00 committed by GitHub
parent 4ec138faea
commit 13f582d864
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/drogon/CONTROL
View File

@ -1,6 +1,5 @@
Source: drogon
Version: 1.0.0
Port-Version: 1
Version: 1.1.0
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 (!osx), libmariadb[iconv] (osx), libpq, sqlite3, brotli, libuuid (!windows)

21
ports/drogon/pg.patch
View File

@ -1,21 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf3c30d..4931b93 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,11 +161,11 @@ endif(NOT WIN32)
if(BUILD_ORM)
# find postgres
- find_package(pg)
- if(pg_FOUND)
- message(STATUS "libpq inc path:" ${PG_INCLUDE_DIRS})
- message(STATUS "libpq lib:" ${PG_LIBRARIES})
- target_link_libraries(${PROJECT_NAME} PRIVATE pg_lib)
+ find_package(PostgreSQL REQUIRED)
+ if(PostgreSQL_FOUND)
+ message(STATUS "libpq inc path:" ${PostgreSQL_INCLUDE_DIRS})
+ message(STATUS "libpq lib:" ${PostgreSQL_LIBRARIES})
+ target_link_libraries(${PROJECT_NAME} PRIVATE ${PostgreSQL_LIBRARIES})
set(DROGON_SOURCES ${DROGON_SOURCES}
orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc)
if(LIBPQ_BATCH_MODE)

5
ports/drogon/portfile.cmake
View File

@ -1,12 +1,11 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO an-tao/drogon
REF v1.0.0
SHA512 3ea447bee4be1956018af597d5c97d54ff04a6403cc3a0bda36ed905d459c15db8a5134cad0b68d5f628725c5488f8cb6aabbcd281faf5d62775d739b02d4c45
REF v1.1.0
SHA512 00d7d64fc666b0b2c02afab899f622123883b62b274d33f3504da6250a6458fc56ab12b131c24f9a7e20284bc5c3604a4f2dd796f56ad00d454d9f8504d8f96e
HEAD_REF master
PATCHES
vcpkg.patch
pg.patch
)
vcpkg_configure_cmake(

21
ports/drogon/vcpkg.patch
View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aab915d..4daeb87 100755
index 96d6c6a..9d3dd24 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,9 +64,9 @@ if(WIN32)
@@ -72,9 +72,9 @@ if(WIN32)
PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/mman-win32>)
endif(WIN32)
@ -14,3 +14,20 @@ index aab915d..4daeb87 100755
if(NOT WIN32)
target_link_libraries(${PROJECT_NAME} PRIVATE dl)
@@ -169,11 +169,11 @@ endif(NOT WIN32)
if(BUILD_ORM)
# find postgres
- find_package(pg)
- if(pg_FOUND)
- message(STATUS "libpq inc path:" ${PG_INCLUDE_DIRS})
- message(STATUS "libpq lib:" ${PG_LIBRARIES})
- target_link_libraries(${PROJECT_NAME} PRIVATE pg_lib)
+ find_package(PostgreSQL REQUIRED)
+ if(PostgreSQL_FOUND)
+ message(STATUS "libpq inc path:" ${PostgreSQL_INCLUDE_DIRS})
+ message(STATUS "libpq lib:" ${PostgreSQL_LIBRARIES})
+ target_link_libraries(${PROJECT_NAME} PRIVATE ${PostgreSQL_LIBRARIES})
set(DROGON_SOURCES ${DROGON_SOURCES}
orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc)
if(LIBPQ_BATCH_MODE)