generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-23 16:48:06 +02:00
Code Issues Projects Releases Wiki Activity

3925 c mysql compile fail (#3928)

Browse Source 
* fix(CI): CI MySQL compile fail #3925 (Linux)

* fix(CI): CI MySQL compile fail #3925 (Linux, 2nd attempt)

* fix(CI): CI MySQL compile fail #3925 (OSX)
This commit is contained in:
Aleksandar Fabijanic
2023-01-24 02:35:10 -06:00
committed by GitHub
parent 85c68e7a81
commit ac0c62ebf4
2 changed files with 46 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Data/MySQL/MySQL.make
View File

@@ -1,18 +1,38 @@
# #
# MySQL.make # MySQL.make
# #
# Makefile fragment for finding MySQL library # Makefile fragment for finding MySQL headers and library
# #
ifeq ($(OSNAME),Darwin)
POCO_MYSQL_CONFIG = $(shell whereis -bq mysql_config)
else
ifeq ($(OSNAME),Linux)
POCO_MYSQL_CONFIG = $(shell which mysql_config)
endif
endif
ifneq (, $(POCO_MYSQL_CONFIG))
ifndef POCO_MYSQL_INCLUDE
POCO_MYSQL_INCLUDE = $(shell mysql_config --include)
endif
ifndef POCO_MYSQL_LIB
POCO_MYSQL_LIB = $(shell mysql_config --libs)
endif
else
ifndef POCO_MYSQL_INCLUDE ifndef POCO_MYSQL_INCLUDE
ifeq (0, $(shell test -d /usr/local/include/mysql; echo $$?)) ifeq (0, $(shell test -d /usr/local/include/mysql; echo $$?))
POCO_MYSQL_INCLUDE = /usr/local/include POCO_MYSQL_INCLUDE = -I/usr/local/include
else
ifeq (0, $(shell test -d /usr/local/opt/mysql-client/include/mysql; echo $$?))
POCO_MYSQL_INCLUDE = -I/usr/local/opt/mysql-client/include/mysql
else else
ifeq (0, $(shell test -d /usr/local/opt/mysql-client/include; echo $$?)) ifeq (0, $(shell test -d /usr/local/opt/mysql-client/include; echo $$?))
POCO_MYSQL_INCLUDE = /usr/local/opt/mysql-client/include POCO_MYSQL_INCLUDE = -I/usr/local/opt/mysql-client/include
else else
ifeq (0, $(shell test -d /opt/homebrew/opt/mysql-client/include; echo $$?)) ifeq (0, $(shell test -d /opt/homebrew/opt/mysql-client/include; echo $$?))
POCO_MYSQL_INCLUDE = /opt/homebrew/opt/mysql-client/include POCO_MYSQL_INCLUDE = -I/opt/homebrew/opt/mysql-client/include
endif
endif endif
endif endif
endif endif
@@ -20,21 +40,22 @@ endif
ifndef POCO_MYSQL_LIB ifndef POCO_MYSQL_LIB
ifeq (0, $(shell test -d /usr/local/include/mysql; echo $$?)) ifeq (0, $(shell test -d /usr/local/include/mysql; echo $$?))
POCO_MYSQL_LIB = /usr/local/lib POCO_MYSQL_LIB = -L/usr/local/lib
else else
ifeq (0, $(shell test -d /usr/local/opt/mysql-client/lib; echo $$?)) ifeq (0, $(shell test -d /usr/local/opt/mysql-client/lib; echo $$?))
POCO_MYSQL_LIB = /usr/local/opt/mysql-client/lib POCO_MYSQL_LIB = -L/usr/local/opt/mysql-client/lib
else else
ifeq (0, $(shell test -d /opt/homebrew/opt/mysql-client/lib; echo $$?)) ifeq (0, $(shell test -d /opt/homebrew/opt/mysql-client/lib; echo $$?))
POCO_MYSQL_LIB = /opt/homebrew/opt/mysql-client/lib POCO_MYSQL_LIB = -L/opt/homebrew/opt/mysql-client/lib
endif
endif endif
endif endif
endif endif
endif endif
ifdef POCO_MYSQL_INCLUDE ifdef POCO_MYSQL_INCLUDE
INCLUDE += -I$(POCO_MYSQL_INCLUDE) INCLUDE += $(POCO_MYSQL_INCLUDE)
endif endif
ifdef POCO_MYSQL_LIB ifdef POCO_MYSQL_LIB
SYSLIBS += -L$(POCO_MYSQL_LIB) SYSLIBS += $(POCO_MYSQL_LIB)
endif endif

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

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