[mysql-connector-cpp] Add correct target namespace (#26686)

* add correct target namespace

* update version

* correct namespace

* overwrite version

* format patch

* update version
This commit is contained in:
Frank 2022-09-07 03:42:12 +08:00 committed by GitHub
parent 31c43c228c
commit bc19f25585
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 6 deletions

View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index e734714..6f00595 100644 index e734714..6d665dc 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -397,7 +397,7 @@ add_subdirectory(devapi) @@ -397,7 +397,7 @@ add_subdirectory(devapi)
@ -11,10 +11,11 @@ index e734714..6f00595 100644
# #
@@ -473,31 +473,23 @@ set_target_properties(connector PROPERTIES @@ -472,32 +472,23 @@ set_target_properties(connector PROPERTIES
SOVERSION "${ABI_VERSION_MAJOR}"
) )
-
-install(TARGETS connector -install(TARGETS connector
- CONFIGURATIONS Release RelWithDebInfo - CONFIGURATIONS Release RelWithDebInfo
- ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev - ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev
@ -49,7 +50,7 @@ index e734714..6f00595 100644
COMPONENT Debuginfo COMPONENT Debuginfo
) )
@@ -604,3 +596,12 @@ endif() @@ -604,3 +595,15 @@ endif()
show_config_options() show_config_options()
@ -61,5 +62,8 @@ index e734714..6f00595 100644
+ INSTALL_DESTINATION "share/unofficial-mysql-connector-cpp" + INSTALL_DESTINATION "share/unofficial-mysql-connector-cpp"
+) +)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-mysql-connector-cpp-config.cmake" DESTINATION "share/unofficial-mysql-connector-cpp") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-mysql-connector-cpp-config.cmake" DESTINATION "share/unofficial-mysql-connector-cpp")
+install(EXPORT unofficial-mysql-connector-cpp-targets DESTINATION share/unofficial-mysql-connector-cpp) +install(EXPORT unofficial-mysql-connector-cpp-targets
+ NAMESPACE unofficial::mysql-connector-cpp::
+ DESTINATION share/unofficial-mysql-connector-cpp
+)
\ No newline at end of file \ No newline at end of file

View File

@ -1,6 +1,7 @@
{ {
"name": "mysql-connector-cpp", "name": "mysql-connector-cpp",
"version": "8.0.30", "version": "8.0.30",
"port-version": 1,
"description": "This is a release of MySQL Connector/C++, the C++ interface for communicating with MySQL servers.", "description": "This is a release of MySQL Connector/C++, the C++ interface for communicating with MySQL servers.",
"homepage": "https://github.com/mysql/mysql-connector-cpp", "homepage": "https://github.com/mysql/mysql-connector-cpp",
"license": null, "license": null,

View File

@ -4882,7 +4882,7 @@
}, },
"mysql-connector-cpp": { "mysql-connector-cpp": {
"baseline": "8.0.30", "baseline": "8.0.30",
"port-version": 0 "port-version": 1
}, },
"nameof": { "nameof": {
"baseline": "0.10.2", "baseline": "0.10.2",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "0cb6021de557d4669a9483690da1500b2b83ba26",
"version": "8.0.30",
"port-version": 1
},
{ {
"git-tree": "f9da49dfd9685485198c029c16da9f37b2336e93", "git-tree": "f9da49dfd9685485198c029c16da9f37b2336e93",
"version": "8.0.30", "version": "8.0.30",