fix(ODBC): mac build and run #4230

pocoproject · Nov 2, 2023 · 5e6bb8e · 5e6bb8e
1 parent 73e191f
commit 5e6bb8e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/Data/ODBC/ODBC.make b/Data/ODBC/ODBC.make
@@ -5,14 +5,20 @@
 #
 
 ifndef POCO_ODBC_INCLUDE
+ifeq (0, $(shell test -e /usr/include/sql.h; echo $$?))
 POCO_ODBC_INCLUDE = /usr/include
+else ifeq (0, $(shell test -e /opt/homebrew/include; echo $$?))
+POCO_ODBC_INCLUDE = /opt/homebrew/include
+endif
 endif
 
 ifndef POCO_ODBC_LIB
 ifeq (0, $(shell test -d /usr/lib/$(OSARCH)-linux-gnu; echo $$?))
 POCO_ODBC_LIB = /usr/lib/$(OSARCH)-linux-gnu
 else ifeq (0, $(shell test -d /usr/lib64; echo $$?))
 POCO_ODBC_LIB = /usr/lib64
+else ifeq (0, $(shell test -d /opt/homebrew/lib; echo $$?))
+POCO_ODBC_LIB = /opt/homebrew/lib
 else
 POCO_ODBC_LIB = /usr/lib
 endif

diff --git a/Data/ODBC/testsuite/Makefile b/Data/ODBC/testsuite/Makefile
@@ -22,8 +22,10 @@ ifneq ($(OSNAME),Darwin)
 SYSLIBS += -lltdl
 endif
 ifneq ($(OSNAME),FreeBSD)
+ifneq ($(OSNAME),Darwin)
 SYSLIBS += -ldl
 endif
+endif
 
 objects = ODBCTestSuite Driver \
 	ODBCDB2Test ODBCMySQLTest ODBCOracleTest ODBCPostgreSQLTest \

diff --git a/Data/testsuite/src/SQLExecutor.cpp b/Data/testsuite/src/SQLExecutor.cpp
@@ -41,7 +41,6 @@
 #include "Poco/Data/Transaction.h"
 #include "Poco/UnicodeConverter.h"
 #include "Poco/UTFString.h"
-#include <sqltypes.h>
 #include <iostream>
 #include <sstream>
 #include <iterator>