mirror of
https://github.com/pocoproject/poco.git
synced 2025-01-06 08:41:11 +01:00
fix MySQL.make
This commit is contained in:
parent
64ccf120f8
commit
1a4c6e10a6
@ -22,16 +22,16 @@ ifneq (, $(POCO_MYSQL_CONFIG))
|
|||||||
else
|
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 = -I/usr/local/include
|
POCO_MYSQL_INCLUDE = /usr/local/include
|
||||||
else
|
else
|
||||||
ifeq (0, $(shell test -d /usr/local/opt/mysql-client/include/mysql; echo $$?))
|
ifeq (0, $(shell test -d /usr/local/opt/mysql-client/include/mysql; echo $$?))
|
||||||
POCO_MYSQL_INCLUDE = -I/usr/local/opt/mysql-client/include/mysql
|
POCO_MYSQL_INCLUDE = /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 = -I/usr/local/opt/mysql-client/include
|
POCO_MYSQL_INCLUDE = /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 = -I/opt/homebrew/opt/mysql-client/include
|
POCO_MYSQL_INCLUDE = /opt/homebrew/opt/mysql-client/include
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@ -40,13 +40,13 @@ else
|
|||||||
|
|
||||||
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 = -L/usr/local/lib
|
POCO_MYSQL_LIB = /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 = -L/usr/local/opt/mysql-client/lib
|
POCO_MYSQL_LIB = /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 = -L/opt/homebrew/opt/mysql-client/lib
|
POCO_MYSQL_LIB = /opt/homebrew/opt/mysql-client/lib
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@ -54,8 +54,8 @@ else
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef POCO_MYSQL_INCLUDE
|
ifdef POCO_MYSQL_INCLUDE
|
||||||
INCLUDE += $(POCO_MYSQL_INCLUDE)
|
INCLUDE += -I$(POCO_MYSQL_INCLUDE)
|
||||||
endif
|
endif
|
||||||
ifdef POCO_MYSQL_LIB
|
ifdef POCO_MYSQL_LIB
|
||||||
SYSLIBS += $(POCO_MYSQL_LIB)
|
SYSLIBS += -L$(POCO_MYSQL_LIB)
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user