diff options
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/sqldrivers/db2/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/ibase/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/mysql/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/oci/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/odbc/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/psql/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/sqlite/CMakeLists.txt | 4 |
7 files changed, 16 insertions, 0 deletions
diff --git a/src/plugins/sqldrivers/db2/CMakeLists.txt b/src/plugins/sqldrivers/db2/CMakeLists.txt index 6d662434ae..de90d92581 100644 --- a/src/plugins/sqldrivers/db2/CMakeLists.txt +++ b/src/plugins/sqldrivers/db2/CMakeLists.txt @@ -30,3 +30,5 @@ qt_internal_extend_target(QDB2DriverPlugin CONDITION (TEST_architecture_arch STR DEFINES ODBC64 ) + +qt_internal_force_macos_intel_arch(QDB2DriverPlugin) diff --git a/src/plugins/sqldrivers/ibase/CMakeLists.txt b/src/plugins/sqldrivers/ibase/CMakeLists.txt index 5f200597f5..4b914401ed 100644 --- a/src/plugins/sqldrivers/ibase/CMakeLists.txt +++ b/src/plugins/sqldrivers/ibase/CMakeLists.txt @@ -12,3 +12,5 @@ qt_internal_add_plugin(QIBaseDriverPlugin Qt::Core Qt::CorePrivate Qt::SqlPrivate) + +qt_internal_force_macos_intel_arch(QIBaseDriverPlugin) diff --git a/src/plugins/sqldrivers/mysql/CMakeLists.txt b/src/plugins/sqldrivers/mysql/CMakeLists.txt index 8e8244acb3..0679bcb698 100644 --- a/src/plugins/sqldrivers/mysql/CMakeLists.txt +++ b/src/plugins/sqldrivers/mysql/CMakeLists.txt @@ -22,3 +22,5 @@ qt_internal_add_plugin(QMYSQLDriverPlugin #### Keys ignored in scope 1:.:.:mysql.pro:<TRUE>: # OTHER_FILES = "mysql.json" + +qt_internal_force_macos_intel_arch(QMYSQLDriverPlugin) diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt index c6e38f4cdf..4830586064 100644 --- a/src/plugins/sqldrivers/oci/CMakeLists.txt +++ b/src/plugins/sqldrivers/oci/CMakeLists.txt @@ -30,3 +30,5 @@ qt_internal_extend_target(QOCIDriverPlugin CONDITION APPLE LINK_OPTIONS "-Wl,-flat_namespace,-U,_environ" ) + +qt_internal_force_macos_intel_arch(QOCIDriverPlugin) diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt index 99a6b9104d..032d89a244 100644 --- a/src/plugins/sqldrivers/odbc/CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt @@ -32,3 +32,5 @@ qt_internal_extend_target(QODBCDriverPlugin CONDITION UNIX DEFINES UNICODE ) + +qt_internal_force_macos_intel_arch(QODBCDriverPlugin) diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt index b151932da7..648d29f582 100644 --- a/src/plugins/sqldrivers/psql/CMakeLists.txt +++ b/src/plugins/sqldrivers/psql/CMakeLists.txt @@ -35,3 +35,5 @@ if(MINGW) DISABLE_PRECOMPILE_HEADERS ON ) endif() + +qt_internal_force_macos_intel_arch(QPSQLDriverPlugin) diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt index ad39f1547b..bbd03e451f 100644 --- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt @@ -36,6 +36,10 @@ if (NOT QT_FEATURE_system_sqlite) # On newer compilers compiling sqlite.c produces warnings qt_disable_warnings(QSQLiteDriverPlugin) endif() + +if(QT_FEATURE_system_sqlite) + qt_internal_force_macos_intel_arch(QSQLiteDriverPlugin) +endif() # special case end qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite |