diff options
| author | An Tao <antao2002@gmail.com> | 2021-04-13 02:12:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-12 11:12:20 -0700 |
| commit | 680936207c5e389aba3cc8a62ff057b7d408a508 (patch) | |
| tree | da8e1ec098e10fd9464902933635048e17fbec30 /ports/drogon/vcpkg.patch | |
| parent | 3fb49675c5ee2170310f35140d346e9122d79205 (diff) | |
| download | vcpkg-680936207c5e389aba3cc8a62ff057b7d408a508.tar.gz vcpkg-680936207c5e389aba3cc8a62ff057b7d408a508.zip | |
[drogon] Update to 1.5.1 (#17190)
Diffstat (limited to 'ports/drogon/vcpkg.patch')
| -rw-r--r-- | ports/drogon/vcpkg.patch | 61 |
1 files changed, 30 insertions, 31 deletions
diff --git a/ports/drogon/vcpkg.patch b/ports/drogon/vcpkg.patch index 4eaa56607..8aedabdec 100644 --- a/ports/drogon/vcpkg.patch +++ b/ports/drogon/vcpkg.patch @@ -1,10 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1efecf8..198f429 100755 +index 7465e46..9650a59 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -87,9 +85,9 @@ if(WIN32) - PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/mman-win32>) - endif(WIN32) +@@ -99,9 +99,9 @@ if (WIN32) + PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/mman-win32>) + endif (WIN32) -add_subdirectory(trantor) +find_package(Trantor CONFIG REQUIRED) @@ -12,31 +12,30 @@ index 1efecf8..198f429 100755 -target_link_libraries(${PROJECT_NAME} PUBLIC trantor) +target_link_libraries(${PROJECT_NAME} PUBLIC Trantor::Trantor) - if(NOT WIN32) - if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") -@@ -188,11 +196,10 @@ endif(NOT WIN32) + if (NOT WIN32) + if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") +@@ -205,11 +205,10 @@ 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) -+ set(pg_FOUND true) -+ target_link_libraries(${PROJECT_NAME} PRIVATE PostgreSQL::PostgreSQL) - set(DROGON_SOURCES ${DROGON_SOURCES} - orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc) - if(LIBPQ_BATCH_MODE) -@@ -211,8 +224,7 @@ if(BUILD_ORM) - set(DROGON_SOURCES ${DROGON_SOURCES} - orm_lib/src/postgresql_impl/PgConnection.cc) - endif(libpq_supports_batch) -- endif(pg_FOUND) -- -+ endif(PostgreSQL_FOUND) - # Find mysql, only mariadb client liberary is supported - find_package(MySQL) - if(MySQL_FOUND) + if (BUILD_POSTGRESQL) + # 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) ++ set(pg_FOUND true) ++ target_link_libraries(${PROJECT_NAME} PRIVATE PostgreSQL::PostgreSQL) + set(DROGON_SOURCES ${DROGON_SOURCES} + orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc) + if (LIBPQ_BATCH_MODE) +@@ -228,7 +227,7 @@ if (BUILD_POSTGRESQL) + set(DROGON_SOURCES ${DROGON_SOURCES} + orm_lib/src/postgresql_impl/PgConnection.cc) + endif (libpq_supports_batch) +- endif (pg_FOUND) ++ endif (PostgreSQL_FOUND) + endif (BUILD_POSTGRESQL) + + if (BUILD_MYSQL) |