[libmysql] Add target include directories (#25886)

Co-authored-by: Cheney-Wang <[email protected]>
microsoft · Jul 22, 2022 · a84a843 · a84a843
1 parent 31211e0
commit a84a843
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/ports/libmysql/Add-target-include-directories.patch b/ports/libmysql/Add-target-include-directories.patch
@@ -0,0 +1,20 @@
+diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake
+index 88b53e7..f49e44d 100644
+--- a/cmake/libutils.cmake
++++ b/cmake/libutils.cmake
+@@ -179,6 +179,7 @@ MACRO(MERGE_LIBRARIES_SHARED)
+     ADD_VERSION_INFO(${TARGET} SHARED SRC)
+   ENDIF()
+   ADD_LIBRARY(${TARGET} SHARED ${SRC})
++  TARGET_INCLUDE_DIRECTORIES(${TARGET} INTERFACE $<INSTALL_INTERFACE:include>)
+
+   IF(ARG_EXCLUDE_FROM_ALL)
+     IF(NOT ARG_SKIP_INSTALL)
+@@ -274,6 +275,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES)
+   SET(SOURCE_FILE
+     ${CMAKE_BINARY_DIR}/archive_output_directory/${TARGET}_depends.c)
+   ADD_LIBRARY(${TARGET} STATIC ${SOURCE_FILE})
++  TARGET_INCLUDE_DIRECTORIES(${TARGET} INTERFACE $<INSTALL_INTERFACE:include>)
+
+   IF(ARG_EXCLUDE_FROM_ALL)
+     IF(NOT ARG_SKIP_INSTALL)
diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake
@@ -19,16 +19,18 @@ vcpkg_from_github(
         export-cmake-targets.patch
         004-added-limits-include.patch
         openssl.patch
+        Add-target-include-directories.patch
 )
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/include/boost_1_70_0")
 
-set(STACK_DIRECTION)
+set(STACK_DIRECTION "")
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
     set(STACK_DIRECTION -DSTACK_DIRECTION=-1)
 endif()
 
 #Skip the version check for Visual Studio
+set(FORCE_UNSUPPORTED_COMPILER "")
 if(VCPKG_TARGET_IS_WINDOWS)
     set(FORCE_UNSUPPORTED_COMPILER 1)
 endif()

diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "libmysql",
   "version": "8.0.20",
-  "port-version": 6,
+  "port-version": 7,
   "description": "A MySQL client library for C development",
   "homepage": "https://github.com/mysql/mysql-server",
+  "license": "GPL-2.0-or-later",
   "supports": "!(windows & x86) & !uwp",
   "dependencies": [
     "boost-algorithm",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3874,7 +3874,7 @@
     },
     "libmysql": {
       "baseline": "8.0.20",
-      "port-version": 6
+      "port-version": 7
     },
     "libnice": {
       "baseline": "0.1.18",

diff --git a/versions/l-/libmysql.json b/versions/l-/libmysql.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bde440f72e606ffbfcfba3393813261aa91e5c05",
+      "version": "8.0.20",
+      "port-version": 7
+    },
     {
       "git-tree": "2bc452d4f5cd5392799424e1bb920175f979dd84",
       "version": "8.0.20",