10 files changed, 42 insertions, 20 deletions
diff --git a/ports/libodb-mysql/CONTROL b/ports/libodb-mysql/CONTROL
deleted file mode 100644
index e6a4e0689..000000000
--- a/ports/libodb-mysql/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: libodb-mysql
-Version: 2.4.0-7
-Homepage: https://www.codesynthesis.com/products/odb/
-Description: MySQL support for the ODB ORM library
-Build-Depends: libodb, libmysql
diff --git a/ports/libodb-mysql/portfile.cmake b/ports/libodb-mysql/portfile.cmake
index a52f6fc05..cc0d7c58c 100644
--- a/ports/libodb-mysql/portfile.cmake
+++ b/ports/libodb-mysql/portfile.cmake
@@ -18,8 +18,9 @@ file(COPY
   DESTINATION ${SOURCE_PATH})
 
 set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql")
-set(MYSQL_LIB "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib")
-set(MYSQL_LIB_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/libmysql.lib")
+find_library(MYSQL_LIB NAMES libmysql mysqlclient PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}" NO_DEFAULT_PATH REQUIRED)
+find_library(MYSQL_LIB_DEBUG NAMES libmysql mysqlclient PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}/debug" NO_DEFAULT_PATH REQUIRED)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     DISABLE_PARALLEL_CONFIGURE
@@ -35,11 +36,9 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_mysqlConfig-debug.cmake LIBODB_DEBUG_TARGETS)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_mysqlConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}")
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/odb TARGET_PATH share/odb)
 
 vcpkg_copy_pdbs()
 
+file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/libodb-mysql/usage b/ports/libodb-mysql/usage
new file mode 100644
index 000000000..2ddd4550a
--- /dev/null
+++ b/ports/libodb-mysql/usage
@@ -0,0 +1,4 @@
+The package libodb-mysql provides CMake integration:
+
+    find_package(odb CONFIG COMPONENTS libodb mysql REQUIRED)
+    target_link_libraries(main PRIVATE odb::libodb-mysql)
diff --git a/ports/libodb-mysql/vcpkg.json b/ports/libodb-mysql/vcpkg.json
new file mode 100644
index 000000000..8d6ca1fd7
--- /dev/null
+++ b/ports/libodb-mysql/vcpkg.json
@@ -0,0 +1,11 @@
+{
+  "name": "libodb-mysql",
+  "version": "2.4.0",
+  "port-version": 8,
+  "description": "MySQL support for the ODB ORM library",
+  "homepage": "https://www.codesynthesis.com/products/odb/",
+  "dependencies": [
+    "libmysql",
+    "libodb"
+  ]
+}
diff --git a/ports/libodb/CONTROL b/ports/libodb/CONTROL
deleted file mode 100644
index 71af41914..000000000
--- a/ports/libodb/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: libodb
-Version: 2.4.0-6
-Homepage: https://www.codesynthesis.com/products/odb/
-Description: ODB library, base runtime for the ODB ORM solution
diff --git a/ports/libodb/odbConfig.cmake b/ports/libodb/odbConfig.cmake
index afe51dc16..f3037bde1 100644
--- a/ports/libodb/odbConfig.cmake
+++ b/ports/libodb/odbConfig.cmake
@@ -1,4 +1,4 @@
-set(_supported_components libodb sqlite pgsql)
+set(_supported_components libodb sqlite mysql pgsql)
 
 foreach(_comp ${odb_FIND_COMPONENTS})
     if(NOT ";${_supported_components};" MATCHES _comp)
diff --git a/ports/libodb/vcpkg.json b/ports/libodb/vcpkg.json
new file mode 100644
index 000000000..e45b478d4
--- /dev/null
+++ b/ports/libodb/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "libodb",
+  "version": "2.4.0",
+  "port-version": 7,
+  "description": "ODB library, base runtime for the ODB ORM solution",
+  "homepage": "https://www.codesynthesis.com/products/odb/"
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 47004fa8a..fcf6d9165 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3289,16 +3289,16 @@
       "port-version": 0
     },
     "libodb": {
-      "baseline": "2.4.0-6",
-      "port-version": 0
+      "baseline": "2.4.0",
+      "port-version": 7
     },
     "libodb-boost": {
       "baseline": "2.4.0-3",
       "port-version": 0
     },
     "libodb-mysql": {
-      "baseline": "2.4.0-7",
-      "port-version": 0
+      "baseline": "2.4.0",
+      "port-version": 8
     },
     "libodb-pgsql": {
       "baseline": "2.4.0-3",
diff --git a/versions/l-/libodb-mysql.json b/versions/l-/libodb-mysql.json
index d6a885a1b..6806250f6 100644
--- a/versions/l-/libodb-mysql.json
+++ b/versions/l-/libodb-mysql.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "208d05d2a1a41329632318e2950c1300cf75eb51",
+      "version": "2.4.0",
+      "port-version": 8
+    },
+    {
       "git-tree": "684fea6cb54563fb4d54b05b259ecb6b5cbd0266",
       "version-string": "2.4.0-7",
       "port-version": 0
diff --git a/versions/l-/libodb.json b/versions/l-/libodb.json
index 0b0a7e292..5254d3af8 100644
--- a/versions/l-/libodb.json
+++ b/versions/l-/libodb.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "6be9a8547e11c2b30077c90504c6dc714f854076",
+      "version": "2.4.0",
+      "port-version": 7
+    },
+    {
       "git-tree": "cc5f10b9764952399ce497cf82615ea730dace28",
       "version-string": "2.4.0-6",
       "port-version": 0