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

Fix #include <mysql.h> with CLang on MacOS Darwin

Browse Source 
Signed-off-by: Francis ANDRE <francis.andre.kampbell@orange.fr>
This commit is contained in:
Francis ANDRE
2022-08-20 16:23:09 +02:00
parent 4c04a6285f
commit 89b7b4303c
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Data/MySQL/MySQL.make
View File

@@ -7,19 +7,16 @@
# Note: linking order is important, do not change it. # Note: linking order is important, do not change it.
ifndef POCO_MYSQL_INCLUDE
POCO_MYSQL_INCLUDE= -I./../include -I/usr/local/include/mysql -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include
endif
ifndef POCO_MYSQL_LIB
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)
endif
ifdef POCO_MYSQL_INCLUDE ifdef POCO_MYSQL_INCLUDE
INCLUDE += -I$(POCO_MYSQL_INCLUDE) INCLUDE += -I$(POCO_MYSQL_INCLUDE)
else
INCLUDE += -I./../include -I/usr/local/include/mysql -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include -I/usr/local/opt/mysql-client/include -I/usr/local/opt/mysql-client/include/mysql
endif endif
ifdef POCO_MYSQL_LIB ifdef POCO_MYSQL_LIB
SYSLIBS += -L$(POCO_MYSQL_LIB) SYSLIBS += -L$(POCO_MYSQL_LIB)
else
SYSLIBS += -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) -L/usr/local/opt/mysql-client/lib
endif endif
# Note: linking order is important, do not change it. # Note: linking order is important, do not change it.

5
cmake/FindMySQL.cmake
View File

@@ -37,7 +37,7 @@ find_path(MYSQL_INCLUDE_DIR mysql.h
/usr/local/include /usr/local/include
/usr/mysql/include /usr/mysql/include
/usr/local/mysql/include /usr/local/mysql/include
/opt/include /usr/local/opt/mysql-client/include
/opt/local/include /opt/local/include
/opt/mysql/include /opt/mysql/include
$ENV{MYSQL_INCLUDE_DIR} $ENV{MYSQL_INCLUDE_DIR}
@@ -71,12 +71,13 @@ 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
/usr/local/lib$(LIB64SUFFIX)/mysql /usr/local/lib$(LIB64SUFFIX)/mysql
/usr/lib$(LIB64SUFFIX)/mysql /usr/lib$(LIB64SUFFIX)/mysql
/usr/mysql/lib$(LIB64SUFFIX) /usr/mysql/lib$(LIB64SUFFIX)
/usr/mysql/lib$(LIB64SUFFIX)/mysql /usr/mysql/lib$(LIB64SUFFIX)/mysql
/usr/local/mysql/lib$(LIB64SUFFIX) /usr/local/mysql/lib$(LIB64SUFFIX)
/usr/local/opt/mysql-client/lib
$ENV{MYSQL_DIR}/lib $ENV{MYSQL_DIR}/lib
$ENV{MYSQL_DIR}/libmysql $ENV{MYSQL_DIR}/libmysql
$ENV{MYSQL_DIR}/client $ENV{MYSQL_DIR}/client