diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2019-09-05 10:07:24 +0300 |
|---|---|---|
| committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2019-09-05 08:24:07 +0000 |
| commit | b2a11daaa177805d36e33ca57e94093919107269 (patch) | |
| tree | 0b4ac36476c65609125f013c82ce65cf8007b243 /src/plugins | |
| parent | 4ee762cf25e4aa0801297d1a8152ecbb598a02b5 (diff) | |
cmake: Enable building of the oci plugin
Change-Id: I003d6da10c7e47402fb373d3956817817328cf0f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/sqldrivers/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/configure.cmake | 3 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/oci/CMakeLists.txt | 35 |
3 files changed, 39 insertions, 3 deletions
diff --git a/src/plugins/sqldrivers/CMakeLists.txt b/src/plugins/sqldrivers/CMakeLists.txt index 67101d4e96..75ac876f70 100644 --- a/src/plugins/sqldrivers/CMakeLists.txt +++ b/src/plugins/sqldrivers/CMakeLists.txt @@ -31,11 +31,11 @@ if(QT_FEATURE_sql_tds) endif() if(QT_FEATURE_sql_oci) -# TODO add_subdirectory(oci) + add_subdirectory(oci) endif() if(QT_FEATURE_sql_db2) - add_subdirectory(db2) + add_subdirectory(db2) endif() if(QT_FEATURE_sql_sqlite) diff --git a/src/plugins/sqldrivers/configure.cmake b/src/plugins/sqldrivers/configure.cmake index f57b469318..e34200bf8f 100644 --- a/src/plugins/sqldrivers/configure.cmake +++ b/src/plugins/sqldrivers/configure.cmake @@ -9,6 +9,7 @@ qt_find_package(DB2 PROVIDED_TARGETS DB2::DB2) qt_find_package(MySQL PROVIDED_TARGETS MySQL::MySQL) qt_find_package(PostgreSQL PROVIDED_TARGETS PostgreSQL::PostgreSQL) +qt_find_package(Oracle PROVIDED_TARGETS Oracle::OCI) qt_find_package(ODBC PROVIDED_TARGETS ODBC::ODBC) qt_find_package(SQLite3 PROVIDED_TARGETS SQLite::SQLite3) @@ -33,7 +34,7 @@ qt_feature("sql_mysql" PRIVATE ) qt_feature("sql_oci" PRIVATE LABEL "OCI (Oracle)" - CONDITION libs.oci OR FIXME + CONDITION Oracle_FOUND ) qt_feature("sql_odbc" PRIVATE LABEL "ODBC" diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt new file mode 100644 index 0000000000..35747834f8 --- /dev/null +++ b/src/plugins/sqldrivers/oci/CMakeLists.txt @@ -0,0 +1,35 @@ +# Generated from oci.pro. + +##################################################################### +## qsqloci Plugin: +##################################################################### + +add_qt_plugin(qsqloci + TYPE sqldrivers + CLASS_NAME QOCIDriverPlugin + SOURCES + main.cpp + qsql_oci.cpp qsql_oci_p.h + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + LIBRARIES + Qt::CorePrivate + Qt::SqlPrivate + PUBLIC_LIBRARIES + Oracle::OCI + Qt::Core + Qt::Sql +) + +#### Keys ignored in scope 1:.:.:oci.pro:<TRUE>: +# OTHER_FILES = "oci.json" +# PLUGIN_CLASS_NAME = "QOCIDriverPlugin" + +## Scopes: +##################################################################### + +extend_target(qsqloci CONDITION APPLE + LINK_OPTIONS + "-Wl,-flat_namespace,-U,_environ" +) |