mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 19:25:27 +08:00
[libmysql] Fix libmysql export static library error (#31368)
* fix no found libmysql * update version * fix export patch * update version * fix export patch * update version
This commit is contained in:
parent
3d04b3819b
commit
e98d2f26b7
@ -38,29 +38,30 @@ index 870c9f13732..98bc3ea15e4 100644
|
||||
INSTALL_DEBUG_SYMBOLS(${target})
|
||||
SET(INSTALL_LOCATION)
|
||||
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake
|
||||
index ae13a63dfdc..ee9462c4c90 100644
|
||||
index 23e60ad..cc969a8 100644
|
||||
--- a/cmake/libutils.cmake
|
||||
+++ b/cmake/libutils.cmake
|
||||
@@ -297,8 +297,7 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG)
|
||||
@@ -298,8 +298,9 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG)
|
||||
IF(ARG_NAMELINK_SKIP)
|
||||
SET(INSTALL_ARGS NAMELINK_SKIP)
|
||||
ENDIF()
|
||||
- MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${DESTINATION}" ${COMP}
|
||||
- ${INSTALL_ARGS})
|
||||
+ MYSQL_INSTALL_TARGET(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP})
|
||||
+ IF(NOT INSTALL_STATIC_LIBRARIES)
|
||||
+ MYSQL_INSTALL_TARGET(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP})
|
||||
+ ENDIF()
|
||||
ENDIF()
|
||||
|
||||
|
||||
IF(WIN32)
|
||||
@@ -545,8 +544,7 @@ FUNCTION(ADD_SHARED_LIBRARY TARGET_ARG)
|
||||
ELSE()
|
||||
SET(COMP COMPONENT SharedLibraries)
|
||||
@@ -464,7 +465,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG)
|
||||
SET(COMP COMPONENT ${ARG_COMPONENT})
|
||||
ENDIF()
|
||||
IF(INSTALL_STATIC_LIBRARIES)
|
||||
- MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP})
|
||||
+ MYSQL_INSTALL_TARGET(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP})
|
||||
ENDIF()
|
||||
- MYSQL_INSTALL_TARGET(
|
||||
- ${TARGET} DESTINATION "${DESTINATION}" ${COMP})
|
||||
+ MYSQL_INSTALL_TARGET(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP})
|
||||
ENDIF()
|
||||
|
||||
IF(ARG_COMPILE_DEFINITIONS)
|
||||
ENDMACRO(MERGE_CONVENIENCE_LIBRARIES)
|
||||
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
|
||||
index 2ee26bfa284..46583f4f0a3 100644
|
||||
--- a/libmysql/CMakeLists.txt
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "libmysql",
|
||||
"version": "8.0.32",
|
||||
"port-version": 3,
|
||||
"port-version": 4,
|
||||
"description": "A MySQL client library for C development",
|
||||
"homepage": "https://github.com/mysql/mysql-server",
|
||||
"license": "GPL-2.0-or-later",
|
||||
|
@ -4274,7 +4274,7 @@
|
||||
},
|
||||
"libmysql": {
|
||||
"baseline": "8.0.32",
|
||||
"port-version": 3
|
||||
"port-version": 4
|
||||
},
|
||||
"libnice": {
|
||||
"baseline": "0.1.21",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "95618ed8c0e55195ee395eaf7bb230cc61776b33",
|
||||
"version": "8.0.32",
|
||||
"port-version": 4
|
||||
},
|
||||
{
|
||||
"git-tree": "79e48f5efa358526cd1cd290fd477f366863129e",
|
||||
"version": "8.0.32",
|
||||
|
Loading…
x
Reference in New Issue
Block a user