generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-29 12:18:01 +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

22
Data/MySQL/MySQL.make
View File

@@ -4,24 +4,15 @@
# Makefile fragment for finding MySQL library # Makefile fragment for finding MySQL library
# #
# Note: linking order is important, do not change it.
ifndef POCO_MYSQL_INCLUDE ifndef POCO_MYSQL_INCLUDE
ifeq (0, $(shell test -d /usr/local/include/mysql; echo $$?)) POCO_MYSQL_INCLUDE= -I./../include -I/usr/local/include/mysql -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include
POCO_MYSQL_INCLUDE = /usr/local/include
else
ifeq (0, $(shell test -d /usr/local/opt/mysql-client/include; echo $$?))
POCO_MYSQL_INCLUDE = /usr/local/opt/mysql-client/include
endif
endif
endif endif
ifndef POCO_MYSQL_LIB ifndef POCO_MYSQL_LIB
ifeq (0, $(shell test -d /usr/local/include/mysql; echo $$?)) POCO_MYSQL_LIB= -L/usr/local/lib -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX)
POCO_MYSQL_LIB = /usr/local/lib
else
ifeq (0, $(shell test -d /usr/local/opt/mysql-client/lib; echo $$?))
POCO_MYSQL_LIB = /usr/local/opt/mysql-client/lib
endif
endif
endif endif
ifdef POCO_MYSQL_INCLUDE ifdef POCO_MYSQL_INCLUDE
@@ -30,3 +21,6 @@ endif
ifdef POCO_MYSQL_LIB ifdef POCO_MYSQL_LIB
SYSLIBS += -L$(POCO_MYSQL_LIB) SYSLIBS += -L$(POCO_MYSQL_LIB)
endif endif
# Note: linking order is important, do not change it.
SYSLIBS += -lmysqlclient -lz -lpthread -ldl

2
Data/MySQL/include/Poco/Data/MySQL/Binder.h
View File

@@ -22,7 +22,7 @@
#include "Poco/Data/AbstractBinder.h" #include "Poco/Data/AbstractBinder.h"
#include "Poco/Data/LOB.h" #include "Poco/Data/LOB.h"
#include "Poco/Data/MySQL/MySQLException.h" #include "Poco/Data/MySQL/MySQLException.h"
#include <mysql/mysql.h> #include <mysql.h>
namespace Poco { namespace Poco {

2
Data/MySQL/include/Poco/Data/MySQL/MySQL.h
View File

@@ -19,7 +19,7 @@
#include "Poco/Foundation.h" #include "Poco/Foundation.h"
#include <mysql/mysql.h> #include <mysql.h>
// //

2
Data/MySQL/include/Poco/Data/MySQL/MySQLException.h
View File

@@ -20,7 +20,7 @@
#include "Poco/Data/MySQL/MySQL.h" #include "Poco/Data/MySQL/MySQL.h"
#include "Poco/Data/DataException.h" #include "Poco/Data/DataException.h"
#include <mysql/mysql.h> #include <mysql.h>
#include <typeinfo> #include <typeinfo>
#include <string> #include <string>

2
Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
View File

@@ -19,7 +19,7 @@
#include "Poco/Data/MetaColumn.h" #include "Poco/Data/MetaColumn.h"
#include <mysql/mysql.h> #include <mysql.h>
#include <vector> #include <vector>

2
Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
View File

@@ -19,7 +19,7 @@
#include "Poco/Data/MySQL/MySQLException.h" #include "Poco/Data/MySQL/MySQLException.h"
#include <mysql/mysql.h> #include <mysql.h>
namespace Poco { namespace Poco {

2
Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
View File

@@ -19,7 +19,7 @@
#include "Poco/Data/MySQL/MySQLException.h" #include "Poco/Data/MySQL/MySQLException.h"
#include <mysql/mysql.h> #include <mysql.h>
namespace Poco { namespace Poco {

2
Data/MySQL/include/Poco/Data/MySQL/Utility.h
View File

@@ -20,7 +20,7 @@
#include "Poco/Data/MySQL/MySQL.h" #include "Poco/Data/MySQL/MySQL.h"
#include "Poco/Data/Session.h" #include "Poco/Data/Session.h"
#include <mysql/mysql.h> #include <mysql.h>
namespace Poco { namespace Poco {

2
Data/MySQL/src/Connector.cpp
View File

@@ -16,7 +16,7 @@
#include "Poco/Data/MySQL/SessionImpl.h" #include "Poco/Data/MySQL/SessionImpl.h"
#include "Poco/Data/SessionFactory.h" #include "Poco/Data/SessionFactory.h"
#include "Poco/Exception.h" #include "Poco/Exception.h"
#include <mysql/mysql.h> #include <mysql.h>
namespace Poco { namespace Poco {

2
Data/MySQL/src/MySQLException.cpp
View File

@@ -18,7 +18,7 @@
#include "Poco/Data/MySQL/MySQLException.h" #include "Poco/Data/MySQL/MySQLException.h"
#include <mysql/mysql.h> #include <mysql.h>
#include <stdio.h> #include <stdio.h>

2
Data/MySQL/src/StatementExecutor.cpp
View File

@@ -14,7 +14,7 @@
#include "Poco/Data/MySQL/StatementExecutor.h" #include "Poco/Data/MySQL/StatementExecutor.h"
#include "Poco/Format.h" #include "Poco/Format.h"
#include <mysql/mysql.h> #include <mysql.h>
namespace Poco { namespace Poco {

2
Data/MySQL/src/Utility.cpp
View File

@@ -15,7 +15,7 @@
#include "Poco/Data/MySQL/Utility.h" #include "Poco/Data/MySQL/Utility.h"
#include <mysql/mysql.h> #include <mysql.h>
namespace Poco { namespace Poco {

2
Data/MySQL/testsuite/src/SQLExecutor.cpp
View File

@@ -29,7 +29,7 @@
#include <Winsock2.h> #include <Winsock2.h>
#endif #endif
#include <mysql/mysql.h>
#include <iostream> #include <iostream>
#include <limits> #include <limits>

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_NAME "ProgramFiles(x86)")
SET(BINDIR32 $ENV{${BINDIR32_ENV_NAME}}) SET(BINDIR32 $ENV{${BINDIR32_ENV_NAME}})
find_path(MYSQL_INCLUDE_DIR mysql/mysql.h find_path(MYSQL_INCLUDE_DIR mysql.h
HINTS HINTS
${MYSQL_ROOT_DIR}/include ${MYSQL_ROOT_DIR}/include
${MYSQL_ROOT_INCLUDE_DIRS} ${MYSQL_ROOT_INCLUDE_DIRS}
@@ -35,6 +35,8 @@ find_path(MYSQL_INCLUDE_DIR mysql/mysql.h
${PC_MARIADB_INCLUDE_DIRS} ${PC_MARIADB_INCLUDE_DIRS}
/usr/include /usr/include
/usr/local/include /usr/local/include
/usr/include
/usr/mysql/include
/opt/mysql/mysql/include /opt/mysql/mysql/include
/usr/local/mysql/include /usr/local/mysql/include
$ENV{MYSQL_INCLUDE_DIR} $ENV{MYSQL_INCLUDE_DIR}
@@ -68,6 +70,12 @@ if (MSVC)
PATHS PATHS
${PC_MYSQL_LIBRARY_DIRS} ${PC_MYSQL_LIBRARY_DIRS}
${PC_MARIADB_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}/lib
$ENV{MYSQL_DIR}/libmysql $ENV{MYSQL_DIR}/libmysql
$ENV{MYSQL_DIR}/client $ENV{MYSQL_DIR}/client