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

* add correct target namespace * update version * correct namespace * overwrite version * format patch * update version
SupSuper · Sep 6, 2022 · bc19f25 · bc19f25
1 parent 31c43c2
commit bc19f25
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/ports/mysql-connector-cpp/export-targets.patch b/ports/mysql-connector-cpp/export-targets.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e734714..6f00595 100644
+index e734714..6d665dc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -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
 -  CONFIGURATIONS Release RelWithDebInfo
 -  ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev
@@ -49,7 +50,7 @@ index e734714..6f00595 100644
      COMPONENT Debuginfo
    )
 
-@@ -604,3 +596,12 @@ endif()
+@@ -604,3 +595,15 @@ endif()
 
 
  show_config_options()
@@ -61,5 +62,8 @@ index e734714..6f00595 100644
 +  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(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
diff --git a/ports/mysql-connector-cpp/vcpkg.json b/ports/mysql-connector-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "mysql-connector-cpp",
   "version": "8.0.30",
+  "port-version": 1,
   "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",
   "license": null,

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4882,7 +4882,7 @@
     },
     "mysql-connector-cpp": {
       "baseline": "8.0.30",
-      "port-version": 0
+      "port-version": 1
     },
     "nameof": {
       "baseline": "0.10.2",

diff --git a/versions/m-/mysql-connector-cpp.json b/versions/m-/mysql-connector-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0cb6021de557d4669a9483690da1500b2b83ba26",
+      "version": "8.0.30",
+      "port-version": 1
+    },
     {
       "git-tree": "f9da49dfd9685485198c029c16da9f37b2336e93",
       "version": "8.0.30",