early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,24 @@
--- "a/CMakeLists.txt"
+++ "b/CMakeLists.txt"
@@ -110,6 +110,13 @@ message(STATUS "nanodbc feature: Enable SQL_NO_DATA bug workaround - ${NANODBC_E
## find unixODBC or iODBC config binary
########################################
if(UNIX)
+ # Try to find unixodbc package first
+ find_package(unixodbc)
+ if(unixodbc_FOUND)
+ message(STATUS "nanodbc build: unixODBC package found")
+ set(ODBCLIB UNIX::odbc)
+ set(ODBC_CONFIG true)
+ else()
# Try to find unixODBC first via odbc_config program.
find_program(ODBC_CONFIG odbc_config
PATHS $ENV{ODBC_PATH}/bin /usr/bin /usr/local/bin)
@@ -158,6 +165,7 @@ if(UNIX)
endif()
endif()
endif()
+ endif()
if(NOT ODBC_CONFIG)
message(FATAL_ERROR "can not find a suitable odbc driver manager")