diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-22 21:01:32 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-05-19 13:26:53 +0200 |
| commit | 759da6742a513fa3fb85bb6db569cff5a53a47d6 (patch) | |
| tree | e3f45a31991eac56b6ac699a6ebb8678ff168780 /src/plugins/sqldrivers/configure.cmake | |
| parent | aed7a65b8b0870d8a019f7917888587de2a66303 (diff) | |
CMake: Generate information about 3rdparty libs in module .pri files
For modules that are not yet ported to CMake and that use
QMAKE_USE += libfoo
we need to provide the information about libfoo in the qt_lib_XXX.pri
files.
Also, we now generate qt_ext_XXX.pri files for bundled 3rdparty libs.
Task-number: QTBUG-75666
Change-Id: I9e4b057a197554ecb37c294c0bf09e2a2b3aa053
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins/sqldrivers/configure.cmake')
| -rw-r--r-- | src/plugins/sqldrivers/configure.cmake | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/plugins/sqldrivers/configure.cmake b/src/plugins/sqldrivers/configure.cmake index 3733afc859..d742018b9f 100644 --- a/src/plugins/sqldrivers/configure.cmake +++ b/src/plugins/sqldrivers/configure.cmake @@ -10,12 +10,15 @@ set_property(CACHE INPUT_sqlite PROPERTY STRINGS undefined qt system) #### Libraries -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) +qt_find_package(DB2 PROVIDED_TARGETS DB2::DB2 MODULE_NAME sqldrivers QMAKE_LIB db2) +qt_find_package(MySQL PROVIDED_TARGETS MySQL::MySQL MODULE_NAME sqldrivers QMAKE_LIB mysql) +qt_find_package(PostgreSQL PROVIDED_TARGETS PostgreSQL::PostgreSQL MODULE_NAME sqldrivers QMAKE_LIB psql) +qt_find_package(Oracle PROVIDED_TARGETS Oracle::OCI MODULE_NAME sqldrivers QMAKE_LIB oci) +qt_find_package(ODBC PROVIDED_TARGETS ODBC::ODBC MODULE_NAME sqldrivers QMAKE_LIB odbc) +qt_find_package(SQLite3 PROVIDED_TARGETS SQLite::SQLite3 MODULE_NAME sqldrivers QMAKE_LIB sqlite3) +if(NOT WIN32 AND QT_FEATURE_system_zlib) + qt_add_qmake_lib_dependency(sqlite3 zlib) +endif() #### Tests |