Improve dependency libs during linking based on components enabled - resolves link errors on missing libs when a component is disabled.
This commit is contained in:
Родитель
ed536d12a8
Коммит
0cd0f4cacf
|
@ -15,7 +15,7 @@
|
||||||
include $(POCO_BASE)/build/rules/global
|
include $(POCO_BASE)/build/rules/global
|
||||||
|
|
||||||
ifeq ($(POCO_CONFIG),MinGW)
|
ifeq ($(POCO_CONFIG),MinGW)
|
||||||
SYSLIBS += -lodbc32
|
# Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib
|
||||||
else
|
else
|
||||||
ifeq (0, $(shell test -e /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?))
|
ifeq (0, $(shell test -e /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?))
|
||||||
SYSLIBS += -lodbc -lodbcinst
|
SYSLIBS += -lodbc -lodbcinst
|
||||||
|
|
|
@ -14,6 +14,9 @@
|
||||||
|
|
||||||
include $(POCO_BASE)/build/rules/global
|
include $(POCO_BASE)/build/rules/global
|
||||||
|
|
||||||
|
ifeq ($(POCO_CONFIG),MinGW)
|
||||||
|
# Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib
|
||||||
|
else
|
||||||
ifeq (0, $(shell test -e /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?))
|
ifeq (0, $(shell test -e /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?))
|
||||||
SYSLIBS += -lodbc -lodbcinst
|
SYSLIBS += -lodbc -lodbcinst
|
||||||
COMMONFLAGS += -DPOCO_UNIXODBC
|
COMMONFLAGS += -DPOCO_UNIXODBC
|
||||||
|
@ -25,10 +28,14 @@ else
|
||||||
$(error No ODBC library found. Please install unixODBC or iODBC and try again)
|
$(error No ODBC library found. Please install unixODBC or iODBC and try again)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
objects = ODBCTestSuite Driver \
|
objects = ODBCTestSuite Driver \
|
||||||
ODBCDB2Test ODBCMySQLTest ODBCOracleTest ODBCPostgreSQLTest \
|
ODBCDB2Test ODBCMySQLTest ODBCOracleTest ODBCPostgreSQLTest \
|
||||||
ODBCSQLiteTest ODBCSQLServerTest ODBCTest SQLExecutor
|
ODBCSQLiteTest ODBCSQLServerTest ODBCTest SQLExecutor
|
||||||
|
ifeq ($(POCO_CONFIG),MinGW)
|
||||||
|
objects += ODBCAccessTest
|
||||||
|
endif
|
||||||
|
|
||||||
target = testrunner
|
target = testrunner
|
||||||
target_version = 1
|
target_version = 1
|
||||||
|
|
|
@ -71,4 +71,13 @@ SYSFLAGS = -mno-cygwin -D_WIN32 -DMINGW32 -DWINVER=0x500 -DODBCVER=0x0300 -DPOCO
|
||||||
#
|
#
|
||||||
# System Specific Libraries
|
# System Specific Libraries
|
||||||
#
|
#
|
||||||
SYSLIBS = -L/usr/local/lib -L/usr/lib -liphlpapi -lws2_32 -lssl -lcrypto -lws2_32 -lgdi32
|
SYSLIBS = -L/usr/local/lib -L/usr/lib -liphlpapi -lgdi32
|
||||||
|
ifeq ($(POCO_NET_SUPPORT),enable)
|
||||||
|
SYSLIBS += -lws2_32
|
||||||
|
endif
|
||||||
|
ifeq ($(POCO_NETSSL_SUPPORT),enable)
|
||||||
|
SYSLIBS += -lws2_32 -lssl -lcrypto -lws2_32
|
||||||
|
endif
|
||||||
|
ifeq ($(POCO_DATA_ODBC_SUPPORT),enable)
|
||||||
|
SYSLIBS += -lodbc32
|
||||||
|
endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче