diff options
| author | Ethan Morgan <ethan@gweithio.com> | 2026-02-14 16:44:06 +0000 |
|---|---|---|
| committer | Ethan Morgan <ethan@gweithio.com> | 2026-02-14 16:44:06 +0000 |
| commit | 54409423f767d8b1cf30cb7d0efca6b4ca138823 (patch) | |
| tree | d915ac7828703ce4b963efdd9728a1777ba18c1e /vcpkg/ports/vtk/mysql.diff | |
Diffstat (limited to 'vcpkg/ports/vtk/mysql.diff')
| -rw-r--r-- | vcpkg/ports/vtk/mysql.diff | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/vcpkg/ports/vtk/mysql.diff b/vcpkg/ports/vtk/mysql.diff new file mode 100644 index 0000000..9dc8346 --- /dev/null +++ b/vcpkg/ports/vtk/mysql.diff @@ -0,0 +1,50 @@ +diff --git a/CMake/FindMySQL.cmake b/CMake/FindMySQL.cmake +index cc0679b..330326c 100644 +--- a/CMake/FindMySQL.cmake ++++ b/CMake/FindMySQL.cmake +@@ -1,3 +1,5 @@ ++ ++if(0) + #[==[ + Provides the following variables: + +@@ -110,3 +112,10 @@ else () + endif () + endif () + unset(_MySQL_use_pkgconfig) ++endif() ++ ++if(NOT TARGET MySQL::MySQL) ++ find_package(MySQL NAMES unofficial-libmysql REQUIRED) ++ add_library(MySQL::MySQL INTERFACE IMPORTED) ++ target_link_libraries(MySQL::MySQL INTERFACE unofficial::libmysql::libmysql) ++endif() +diff --git a/IO/MySQL/vtkMySQLDatabasePrivate.h b/IO/MySQL/vtkMySQLDatabasePrivate.h +index 82bc5c5..76256bc 100644 +--- a/IO/MySQL/vtkMySQLDatabasePrivate.h ++++ b/IO/MySQL/vtkMySQLDatabasePrivate.h +@@ -8,7 +8,8 @@ + #endif + + #include "vtkIOMySQLModule.h" // For export macro +-#include <mysql.h> // needed for MYSQL typedefs ++#include <mysql/mysql.h> // needed for MYSQL typedefs ++using my_bool = bool; // removed in libmysql 8.0 + + VTK_ABI_NAMESPACE_BEGIN + class VTKIOMYSQL_EXPORT vtkMySQLDatabasePrivate +diff --git a/IO/MySQL/vtkMySQLQuery.cxx b/IO/MySQL/vtkMySQLQuery.cxx +index 38a9ec9..c5cc785 100644 +--- a/IO/MySQL/vtkMySQLQuery.cxx ++++ b/IO/MySQL/vtkMySQLQuery.cxx +@@ -9,8 +9,8 @@ + #include "vtkVariant.h" + #include "vtkVariantArray.h" + +-#include <errmsg.h> +-#include <mysql.h> ++#include <mysql/errmsg.h> ++#include <mysql/mysql.h> + + #if defined(_WIN32) + #include <locale.h> |