diff options
Diffstat (limited to 'src/plugins/sqldrivers')
-rw-r--r-- | src/plugins/sqldrivers/db2/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/plugins/sqldrivers/mysql/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/oci/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/plugins/sqldrivers/odbc/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/plugins/sqldrivers/psql/.prev_CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/psql/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt | 22 | ||||
-rw-r--r-- | src/plugins/sqldrivers/sqlite/CMakeLists.txt | 4 |
9 files changed, 24 insertions, 24 deletions
diff --git a/src/plugins/sqldrivers/db2/CMakeLists.txt b/src/plugins/sqldrivers/db2/CMakeLists.txt index 9fc1691bdf..d3d46bebbb 100644 --- a/src/plugins/sqldrivers/db2/CMakeLists.txt +++ b/src/plugins/sqldrivers/db2/CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqldb2 Plugin: ##################################################################### -add_qt_plugin(qsqldb2 +qt_add_plugin(qsqldb2 TYPE sqldrivers CLASS_NAME QDB2DriverPlugin SOURCES @@ -28,7 +28,7 @@ add_qt_plugin(qsqldb2 ## Scopes: ##################################################################### -extend_target(qsqldb2 CONDITION (TEST_architecture_arch STREQUAL "x86_64") +qt_extend_target(qsqldb2 CONDITION (TEST_architecture_arch STREQUAL "x86_64") DEFINES ODBC64 ) diff --git a/src/plugins/sqldrivers/mysql/CMakeLists.txt b/src/plugins/sqldrivers/mysql/CMakeLists.txt index 49cb6bfc87..e55a062c9b 100644 --- a/src/plugins/sqldrivers/mysql/CMakeLists.txt +++ b/src/plugins/sqldrivers/mysql/CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqlmysql Plugin: ##################################################################### -add_qt_plugin(qsqlmysql +qt_add_plugin(qsqlmysql TYPE sqldrivers CLASS_NAME QMYSQLDriverPlugin SOURCES diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt index a2cfb11167..3215b87c46 100644 --- a/src/plugins/sqldrivers/oci/CMakeLists.txt +++ b/src/plugins/sqldrivers/oci/CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqloci Plugin: ##################################################################### -add_qt_plugin(qsqloci +qt_add_plugin(qsqloci TYPE sqldrivers CLASS_NAME QOCIDriverPlugin SOURCES @@ -28,7 +28,7 @@ add_qt_plugin(qsqloci ## Scopes: ##################################################################### -extend_target(qsqloci CONDITION APPLE +qt_extend_target(qsqloci CONDITION APPLE LINK_OPTIONS "-Wl,-flat_namespace,-U,_environ" ) diff --git a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt index ac3297eaaf..5eda5899cf 100644 --- a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqlodbc Plugin: ##################################################################### -add_qt_plugin(qsqlodbc +qt_add_plugin(qsqlodbc TYPE sqldrivers CLASS_NAME QODBCDriverPlugin SOURCES @@ -28,7 +28,7 @@ add_qt_plugin(qsqlodbc ## Scopes: ##################################################################### -extend_target(qsqlodbc CONDITION UNIX +qt_extend_target(qsqlodbc CONDITION UNIX DEFINES UNICODE ) diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt index 542d3b9727..871e87a4c1 100644 --- a/src/plugins/sqldrivers/odbc/CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt @@ -6,7 +6,7 @@ qt_find_package(ODBC) # special case -add_qt_plugin(qsqlodbc +qt_add_plugin(qsqlodbc TYPE sqldrivers CLASS_NAME QODBCDriverPlugin SOURCES @@ -30,7 +30,7 @@ add_qt_plugin(qsqlodbc ## Scopes: ##################################################################### -extend_target(qsqlodbc CONDITION UNIX +qt_extend_target(qsqlodbc CONDITION UNIX DEFINES UNICODE ) diff --git a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt index 1d810767bf..4047c6b1f6 100644 --- a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqlpsql Plugin: ##################################################################### -add_qt_plugin(qsqlpsql +qt_add_plugin(qsqlpsql TYPE sqldrivers CLASS_NAME QPSQLDriverPlugin SOURCES diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt index 54da39a51a..46ad12677e 100644 --- a/src/plugins/sqldrivers/psql/CMakeLists.txt +++ b/src/plugins/sqldrivers/psql/CMakeLists.txt @@ -9,7 +9,7 @@ qt_find_package(PostgreSQL) # special case ## qsqlpsql Plugin: ##################################################################### -add_qt_plugin(qsqlpsql +qt_add_plugin(qsqlpsql TYPE sqldrivers CLASS_NAME QPSQLDriverPlugin SOURCES diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt index 45cf01fb1e..ae08f26cb9 100644 --- a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqlite Plugin: ##################################################################### -add_qt_plugin(qsqlite +qt_add_plugin(qsqlite TYPE sqldrivers CLASS_NAME QSQLiteDriverPlugin SOURCES @@ -28,12 +28,12 @@ add_qt_plugin(qsqlite ## Scopes: ##################################################################### -extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite PUBLIC_LIBRARIES sqlite ) -extend_target(qsqlite CONDITION NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION NOT QT_FEATURE_system_sqlite SOURCES ../../../3rdparty/sqlite/sqlite3.c DEFINES @@ -48,22 +48,22 @@ extend_target(qsqlite CONDITION NOT QT_FEATURE_system_sqlite ../../../3rdparty/sqlite ) -extend_target(qsqlite CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite DEFINES NDEBUG ) -extend_target(qsqlite CONDITION NOT CONFIG___contains___largefile AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION NOT CONFIG___contains___largefile AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_DISABLE_LFS ) -extend_target(qsqlite CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite DEFINES HAVE_POSIX_FALLOCATE=1 ) -extend_target(qsqlite CONDITION WINRT AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION WINRT AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_OS_WINRT ) @@ -71,22 +71,22 @@ extend_target(qsqlite CONDITION WINRT AND NOT QT_FEATURE_system_sqlite #### Keys ignored in scope 8:.:../../../3rdparty:../../../3rdparty/sqlite.pri:WINRT: # QMAKE_CFLAGS = "-Gy" -extend_target(qsqlite CONDITION QNX AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION QNX AND NOT QT_FEATURE_system_sqlite DEFINES _QNX_SOURCE ) -extend_target(qsqlite CONDITION UNIX AND NOT QT_FEATURE_system_sqlite AND NOT WINRT AND NOT winphone +qt_extend_target(qsqlite CONDITION UNIX AND NOT QT_FEATURE_system_sqlite AND NOT WINRT AND NOT winphone DEFINES HAVE_USLEEP=1 ) -extend_target(qsqlite CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) -extend_target(qsqlite CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_OMIT_LOAD_EXTENSION ) diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt index 50e3ba69ec..35fe8e69de 100644 --- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqlite Plugin: ##################################################################### -add_qt_plugin(qsqlite +qt_add_plugin(qsqlite TYPE sqldrivers CLASS_NAME QSQLiteDriverPlugin SOURCES @@ -31,5 +31,5 @@ add_qt_plugin(qsqlite # special case begin # Remove non-system-sqlite code -# extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite +# qt_extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite # special case end |