generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-28 19:51:58 +01:00
Code Issues Projects Releases Wiki Activity

Fix Data/MySQL #include <mysql.h> issue for all build systems on all platforms execpt MacOS Darwin.

Browse Source 
Signed-off-by: Francis ANDRE <francis.andre.kampbell@orange.fr>
This commit is contained in:
Francis ANDRE
2022-08-19 08:03:19 +02:00
parent 5c612d80a7
commit ce073b62eb
14 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/FindMySQL.cmake
View File

@@ -26,7 +26,7 @@ pkg_check_modules(PC_MARIADB QUIET mariadb)
SET(BINDIR32_ENV_NAME "ProgramFiles(x86)")
SET(BINDIR32 $ENV{${BINDIR32_ENV_NAME}})
find_path(MYSQL_INCLUDE_DIR mysql/mysql.h
find_path(MYSQL_INCLUDE_DIR mysql.h
HINTS
${MYSQL_ROOT_DIR}/include
${MYSQL_ROOT_INCLUDE_DIRS}
@@ -35,6 +35,8 @@ find_path(MYSQL_INCLUDE_DIR mysql/mysql.h
${PC_MARIADB_INCLUDE_DIRS}
/usr/include
/usr/local/include
/usr/include
/usr/mysql/include
/opt/mysql/mysql/include
/usr/local/mysql/include
$ENV{MYSQL_INCLUDE_DIR}
@@ -68,6 +70,12 @@ if (MSVC)
PATHS
${PC_MYSQL_LIBRARY_DIRS}
${PC_MARIADB_LIBRARY_DIRS}
-L/usr/local/lib
/usr/local/lib$(LIB64SUFFIX)/mysql
/usr/lib$(LIB64SUFFIX)/mysql
/usr/mysql/lib$(LIB64SUFFIX)
/usr/mysql/lib$(LIB64SUFFIX)/mysql
/usr/local/mysql/lib$(LIB64SUFFIX)
$ENV{MYSQL_DIR}/lib
$ENV{MYSQL_DIR}/libmysql
$ENV{MYSQL_DIR}/client