[poco] Fix dependency libmariadb (#14763)

* [poco] Fix dependency libmariadb * [poco] Remove link in codes
microsoft · Nov 30, 2020 · d7c3b9e · d7c3b9e
1 parent b743d46
commit d7c3b9e
Show file tree

Hide file tree

Showing 4 changed files with 255 additions and 221 deletions.
diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL
@@ -1,6 +1,6 @@
 Source: libmariadb
 Version: 3.1.10
-Port-Version: 3
+Port-Version: 4
 Homepage: https://github.com/MariaDB/mariadb-connector-c
 Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases
 Default-Features: zlib, openssl

diff --git a/ports/libmariadb/export-cmake-targets.patch b/ports/libmariadb/export-cmake-targets.patch
@@ -1,8 +1,16 @@
 diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
-index 083a863..d911fa7 100644
+index 083a863..6c8d932 100644
 --- a/libmariadb/CMakeLists.txt
 +++ b/libmariadb/CMakeLists.txt
-@@ -457,13 +457,25 @@ ENDIF()
+@@ -405,6 +405,7 @@ ELSE()
+   TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE mariadbclient)
+   SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C)
+ ENDIF()
++TARGET_INCLUDE_DIRECTORIES(libmariadb PUBLIC $<INSTALL_INTERFACE:include/mysql>)
+
+ TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS})
+
+@@ -457,13 +458,25 @@ ENDIF()
 
  INSTALL(TARGETS mariadbclient
            COMPONENT Development

diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL
@@ -1,6 +1,6 @@
 Source: poco
 Version: 1.10.1
-Port-Version: 2
+Port-Version: 3
 Build-Depends: expat, pcre, zlib
 Description: Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.
 Homepage: https://github.com/pocoproject/poco