diff options
| author | An Tao <antao2002@gmail.com> | 2020-10-24 03:05:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-23 12:05:53 -0700 |
| commit | d022499e92a9178a03dbbe558f63714c1bbe70c6 (patch) | |
| tree | c3b5e1e626459996e99caf9fdbb480960b7a788c | |
| parent | 9190f58d0fd33c2debabd9f7723299ebd77fc7cf (diff) | |
| download | vcpkg-d022499e92a9178a03dbbe558f63714c1bbe70c6.tar.gz vcpkg-d022499e92a9178a03dbbe558f63714c1bbe70c6.zip | |
[drogon] Fix build errors on linux/osx (#14148)
| -rw-r--r-- | ports/drogon/CONTROL | 3 | ||||
| -rw-r--r-- | ports/drogon/pg.patch | 46 |
2 files changed, 22 insertions, 27 deletions
diff --git a/ports/drogon/CONTROL b/ports/drogon/CONTROL index 33c5edad3..f82a9f6ef 100644 --- a/ports/drogon/CONTROL +++ b/ports/drogon/CONTROL @@ -1,5 +1,6 @@ Source: drogon
Version: 1.0.0
+Port-Version: 1
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, libuuid (!windows)
+Build-Depends: trantor, zlib, jsoncpp, libmariadb (!osx), libmariadb[iconv] (osx), libpq, sqlite3, brotli, libuuid (!windows)
diff --git a/ports/drogon/pg.patch b/ports/drogon/pg.patch index 6e718c5e3..34870064f 100644 --- a/ports/drogon/pg.patch +++ b/ports/drogon/pg.patch @@ -1,27 +1,21 @@ -diff --git a/cmake_modules/Findpg.cmake b/cmake_modules/Findpg.cmake -index 53037f2..d13f384 100644 ---- a/cmake_modules/Findpg.cmake -+++ b/cmake_modules/Findpg.cmake -@@ -4,20 +4,14 @@ - # - # This module defines PG_INCLUDE_DIRS, where to find header, etc. PG_LIBRARIES, - # the libraries needed to use PostgreSQL. pg_FOUND, If false, do not try to use --# PostgreSQL. --# pg_lib - The imported target library. -+# PostgreSQL. pg_lib - The imported target library. +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) - find_package(PostgreSQL) - if(PostgreSQL_FOUND) - set(PG_LIBRARIES ${PostgreSQL_LIBRARIES}) - set(PG_INCLUDE_DIRS ${PostgreSQL_INCLUDE_DIRS}) -- message(STATUS "pg inc: " ${PostgreSQL_INCLUDE_DIRS}) - add_library(pg_lib INTERFACE IMPORTED) -- set_target_properties(pg_lib -- PROPERTIES INTERFACE_INCLUDE_DIRECTORIES -- "${PostgreSQL_INCLUDE_DIRS}" -- INTERFACE_LINK_LIBRARIES -- "${PostgreSQL_LIBRARIES}") -+ target_link_libraries(pg_lib INTERFACE PostgreSQL::PostgreSQL) - mark_as_advanced(PG_INCLUDE_DIRS PG_LIBRARIES) - endif(PostgreSQL_FOUND) - include(FindPackageHandleStandardArgs) + 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) |