cmake: Find and build odbc plugin

Change-Id: I479d2b1cc897f601ef68b10272c9396e52228201
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Albert Astals Cid 2019-02-12 14:55:20 +01:00
parent 11acba6504
commit 0a14d13b30
4 changed files with 37 additions and 2 deletions

View File

@ -23,7 +23,7 @@ if(QT_FEATURE_sql_mysql)
endif()
if(QT_FEATURE_sql_odbc)
# TODO add_subdirectory(odbc)
add_subdirectory(odbc)
endif()
if(QT_FEATURE_sql_tds)

View File

@ -8,6 +8,8 @@
find_package(PostgreSQL)
set_package_properties(PostgreSQL PROPERTIES TYPE OPTIONAL)
find_package(ODBC)
set_package_properties(ODBC PROPERTIES TYPE OPTIONAL)
find_package(SQLite3)
set_package_properties(SQLite3 PROPERTIES TYPE OPTIONAL)
@ -36,7 +38,7 @@ qt_feature("sql_oci" PRIVATE
)
qt_feature("sql_odbc" PRIVATE
LABEL "ODBC"
CONDITION QT_FEATURE_datestring AND libs.odbc OR FIXME
CONDITION QT_FEATURE_datestring AND ODBC_FOUND
)
qt_feature("sql_psql" PRIVATE
LABEL "PostgreSQL"

View File

@ -0,0 +1,32 @@
# Generated from odbc.pro.
find_package(ODBC)
#####################################################################
## qsqlodbc Plugin:
#####################################################################
add_qt_plugin(qsqlodbc
TYPE sqldrivers
SOURCES
main.cpp
qsql_odbc.cpp qsql_odbc_p.h
DEFINES
QT_NO_CAST_TO_ASCII
QT_NO_CAST_FROM_ASCII
LIBRARIES
Qt::CorePrivate
Qt::SqlPrivate
ODBC::ODBC
# OTHER_FILES = "odbc.json"
# PLUGIN_CLASS_NAME = "QODBCDriverPlugin"
# _LOADED = "qt_plugin"
)
## Scopes:
#####################################################################
extend_target(qsqlodbc CONDITION UNIX
DEFINES
UNICODE
)

View File

@ -74,6 +74,7 @@ def map_library(lib: str) -> Union[str, LibraryMapping, List[str]]:
'libudev': 'Libudev',
'lttng-ust': LibraryMapping(package='LTTngUST', resultVariable="LTTNGUST"),
'mtdev': 'Mtdev',
'odbc': 'ODBC',
'opengl': LibraryMapping(package="OpenGL", resultVariable="OpenGL_OpenGL"),
'openssl': 'OpenSSL',
'openssl_headers': LibraryMapping(package="OpenSSL", resultVariable="OPENSSL_INCLUDE_DIR", appendFoundSuffix=False),