[libodb-mysql] adapter mysql 8.0 (#3723)

* Install sodium.h

* [libodb-mysql] adapter mysql 8.0
This commit is contained in:
LazyWolf Lin 2018-07-04 09:08:38 +08:00 committed by Robert Schumacher
parent fe23b30178
commit f2aaef68ae
3 changed files with 20 additions and 1 deletions

View File

@ -1,4 +1,4 @@
Source: libodb-mysql Source: libodb-mysql
Version: 2.4.0-1 Version: 2.4.0-2
Description: MySQL support for the ODB ORM library Description: MySQL support for the ODB ORM library
Build-Depends: libodb, libmysql Build-Depends: libodb, libmysql

View File

@ -0,0 +1,13 @@
diff --git a/odb/mysql/mysql-types.hxx b/odb/mysql/mysql-types.hxx
index 1254ccd..5396791 100644
--- a/odb/mysql/mysql-types.hxx
+++ b/odb/mysql/mysql-types.hxx
@@ -7,7 +7,7 @@
#include <odb/mysql/details/config.hxx>
-typedef char my_bool;
+typedef bool my_bool;
typedef struct st_mysql_bind MYSQL_BIND;
#ifdef LIBODB_MYSQL_INCLUDE_SHORT

View File

@ -19,6 +19,12 @@ vcpkg_download_distfile(ARCHIVE
) )
vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/adapter_mysql_8.0.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql") set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql")
set(MYSQL_LIB "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib") set(MYSQL_LIB "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib")