diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2019-09-02 17:37:26 +0300 |
|---|---|---|
| committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2019-09-02 15:16:42 +0000 |
| commit | 3ff31ed020a38a2975e99a44303a70994f3c60f4 (patch) | |
| tree | 3b9a37e516bb3b58ce927caeee38a9dfea64be98 /src | |
| parent | f9842ae7d481cf5df08a000c4af7822d1bee0dd7 (diff) | |
Enable building of the mysql plugin
Change-Id: I8cb97afaaed46ee64b5a133e797179d7ddecdeef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/sqldrivers/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/configure.cmake | 3 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/mysql/CMakeLists.txt | 27 |
3 files changed, 30 insertions, 2 deletions
diff --git a/src/plugins/sqldrivers/CMakeLists.txt b/src/plugins/sqldrivers/CMakeLists.txt index 1676396f3a..61d0da800c 100644 --- a/src/plugins/sqldrivers/CMakeLists.txt +++ b/src/plugins/sqldrivers/CMakeLists.txt @@ -19,7 +19,7 @@ if(QT_FEATURE_sql_psql) endif() if(QT_FEATURE_sql_mysql) -# TODO add_subdirectory(mysql) + add_subdirectory(mysql) endif() if(QT_FEATURE_sql_odbc) diff --git a/src/plugins/sqldrivers/configure.cmake b/src/plugins/sqldrivers/configure.cmake index 037b361559..e8609fb50d 100644 --- a/src/plugins/sqldrivers/configure.cmake +++ b/src/plugins/sqldrivers/configure.cmake @@ -6,6 +6,7 @@ #### Libraries +qt_find_package(MySQL PROVIDED_TARGETS MySQL::MySQL) qt_find_package(PostgreSQL PROVIDED_TARGETS PostgreSQL::PostgreSQL) qt_find_package(ODBC PROVIDED_TARGETS ODBC::ODBC) qt_find_package(SQLite3 PROVIDED_TARGETS SQLite::SQLite3) @@ -27,7 +28,7 @@ qt_feature("sql_ibase" PRIVATE ) qt_feature("sql_mysql" PRIVATE LABEL "MySql" - CONDITION libs.mysql OR FIXME + CONDITION MySQL_FOUND ) qt_feature("sql_oci" PRIVATE LABEL "OCI (Oracle)" diff --git a/src/plugins/sqldrivers/mysql/CMakeLists.txt b/src/plugins/sqldrivers/mysql/CMakeLists.txt new file mode 100644 index 0000000000..21e03ec52c --- /dev/null +++ b/src/plugins/sqldrivers/mysql/CMakeLists.txt @@ -0,0 +1,27 @@ +# Generated from mysql.pro. + +##################################################################### +## qsqlmysql Plugin: +##################################################################### + +add_qt_plugin(qsqlmysql + TYPE sqldrivers + CLASS_NAME QMYSQLDriverPlugin + SOURCES + main.cpp + qsql_mysql.cpp qsql_mysql_p.h + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + LIBRARIES + Qt::CorePrivate + Qt::SqlPrivate + PUBLIC_LIBRARIES + MySQL::MySQL + Qt::Core + Qt::Sql +) + +#### Keys ignored in scope 1:.:.:mysql.pro:<TRUE>: +# OTHER_FILES = "mysql.json" +# PLUGIN_CLASS_NAME = "QMYSQLDriverPlugin" |