generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-31 14:39:53 +01:00
Code Issues Projects Releases Wiki Activity

fix(ODBC): mac build and run #4230

Browse Source
This commit is contained in:
Aleksandar Fabijanic 2023-11-03 00:10:01 +01:00
parent 73e191f185
commit 5e6bb8e396
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Data/ODBC/ODBC.make
View File

@ -5,7 +5,11 @@
# #
ifndef POCO_ODBC_INCLUDE ifndef POCO_ODBC_INCLUDE
ifeq (0, $(shell test -e /usr/include/sql.h; echo $$?))
POCO_ODBC_INCLUDE = /usr/include POCO_ODBC_INCLUDE = /usr/include
else ifeq (0, $(shell test -e /opt/homebrew/include; echo $$?))
POCO_ODBC_INCLUDE = /opt/homebrew/include
endif
endif endif
ifndef POCO_ODBC_LIB ifndef POCO_ODBC_LIB
@ -13,6 +17,8 @@ ifeq (0, $(shell test -d /usr/lib/$(OSARCH)-linux-gnu; echo $$?))
POCO_ODBC_LIB = /usr/lib/$(OSARCH)-linux-gnu POCO_ODBC_LIB = /usr/lib/$(OSARCH)-linux-gnu
else ifeq (0, $(shell test -d /usr/lib64; echo $$?)) else ifeq (0, $(shell test -d /usr/lib64; echo $$?))
POCO_ODBC_LIB = /usr/lib64 POCO_ODBC_LIB = /usr/lib64
else ifeq (0, $(shell test -d /opt/homebrew/lib; echo $$?))
POCO_ODBC_LIB = /opt/homebrew/lib
else else
POCO_ODBC_LIB = /usr/lib POCO_ODBC_LIB = /usr/lib
endif endif

2
Data/ODBC/testsuite/Makefile
View File

@ -22,8 +22,10 @@ ifneq ($(OSNAME),Darwin)
SYSLIBS += -lltdl SYSLIBS += -lltdl
endif endif
ifneq ($(OSNAME),FreeBSD) ifneq ($(OSNAME),FreeBSD)
ifneq ($(OSNAME),Darwin)
SYSLIBS += -ldl SYSLIBS += -ldl
endif endif
endif
objects = ODBCTestSuite Driver \ objects = ODBCTestSuite Driver \
ODBCDB2Test ODBCMySQLTest ODBCOracleTest ODBCPostgreSQLTest \ ODBCDB2Test ODBCMySQLTest ODBCOracleTest ODBCPostgreSQLTest \

1
Data/testsuite/src/SQLExecutor.cpp
View File

@ -41,7 +41,6 @@
#include "Poco/Data/Transaction.h" #include "Poco/Data/Transaction.h"
#include "Poco/UnicodeConverter.h" #include "Poco/UnicodeConverter.h"
#include "Poco/UTFString.h" #include "Poco/UTFString.h"
#include <sqltypes.h>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <iterator> #include <iterator>