summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-04-24 17:14:25 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-05-02 07:30:42 +0000
commit9b0b464e82071338134700edfa190bf998846e4e (patch)
tree4c0390bb52624fdd063f9495bd939c1c4c7d498f /src/plugins
parent42d3b21c92525ea6a430c67e577a5991d679fa1d (diff)
Write find_dependency() calls in Qt Module config files
This change introduces a new function called qt_find_package() which can take an extra option called PROVIDED_TARGETS, which associates targets with the package that defines those targets. This is done by setting the INTERFACE_QT_PACKAGE_NAME and INTERFACE_QT_PACKAGE_VERSION properties on the imported targets. This information allows us to generate appropriate find_dependency() calls in a module's Config file for third party libraries. For example when an application links against QtCore, it should also link against zlib and atomic libraries. In order to do that, the library locations first have to be found by CMake. This is achieved by embedding find_dependency(ZLIB) and find_dependency(Atomic) in Qt5CoreDependencies.cmake which is included by Qt5CoreConfig.cmake. The latter is picked up when an application project contains find_package(Qt5Core), and thus all linking dependencies are resolved. The information 'which package provides which targets' is contained in the python json2cmake conversion script. The generated output of the script contains qt_find_package() calls that represent that information. The Qt5CoreDependencies.cmake file and which which dependencies it contains is generated at the QtPostProcess stop. Note that for non-static Qt builds, we only need to propagate public 3rd party libraries. For static builds, we need all third party libraries. In order for the INTERFACE_QT_PACKAGE_NAME property to be read in any scope, the targets on which the property is set, have to be GLOBAL. Also for applications and other modules to find all required third party libraries, we have to install all our custom Find modules, and make sure they define INTERFACE IMPORTED libraries, and not just IMPORTED libraries. Change-Id: I694d6e32d05b96d5e241df0156fc79d0029426aa Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/generic/tslib/CMakeLists.txt2
-rw-r--r--src/plugins/imageformats/jpeg/CMakeLists.txt2
-rw-r--r--src/plugins/platforminputcontexts/compose/CMakeLists.txt2
-rw-r--r--src/plugins/platforms/cocoa/CMakeLists.txt4
-rw-r--r--src/plugins/platforms/eglfs/CMakeLists.txt4
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt4
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt2
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt2
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt6
-rw-r--r--src/plugins/platforms/minimal/CMakeLists.txt2
-rw-r--r--src/plugins/platforms/minimalegl/CMakeLists.txt2
-rw-r--r--src/plugins/platforms/xcb/CMakeLists.txt14
-rw-r--r--src/plugins/platformthemes/gtk3/CMakeLists.txt4
-rw-r--r--src/plugins/printsupport/cups/CMakeLists.txt2
-rw-r--r--src/plugins/sqldrivers/configure.cmake6
-rw-r--r--src/plugins/sqldrivers/odbc/CMakeLists.txt2
-rw-r--r--src/plugins/sqldrivers/psql/CMakeLists.txt2
17 files changed, 31 insertions, 31 deletions
diff --git a/src/plugins/generic/tslib/CMakeLists.txt b/src/plugins/generic/tslib/CMakeLists.txt
index b46217d845..b4f0c9ab04 100644
--- a/src/plugins/generic/tslib/CMakeLists.txt
+++ b/src/plugins/generic/tslib/CMakeLists.txt
@@ -1,6 +1,6 @@
# Generated from tslib.pro.
-find_package(Tslib) # special case
+qt_find_package(Tslib) # special case
#####################################################################
## qtslibplugin Plugin:
diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt
index f70c72b992..39c45bc2fe 100644
--- a/src/plugins/imageformats/jpeg/CMakeLists.txt
+++ b/src/plugins/imageformats/jpeg/CMakeLists.txt
@@ -4,7 +4,7 @@
## qjpeg Plugin:
#####################################################################
-find_package(JPEG)
+qt_find_package(JPEG) # special case
add_qt_plugin(qjpeg
TYPE imageformats
diff --git a/src/plugins/platforminputcontexts/compose/CMakeLists.txt b/src/plugins/platforminputcontexts/compose/CMakeLists.txt
index eaa3ac8f73..e903d56d74 100644
--- a/src/plugins/platforminputcontexts/compose/CMakeLists.txt
+++ b/src/plugins/platforminputcontexts/compose/CMakeLists.txt
@@ -4,7 +4,7 @@
## composeplatforminputcontextplugin Plugin:
#####################################################################
-find_package(XKB) # special case
+qt_find_package(XKB) # special case
pkg_get_variable(PKG_X11_PREFIX x11 prefix) # special case
diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt
index 0b08d49390..9a6902356e 100644
--- a/src/plugins/platforms/cocoa/CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/CMakeLists.txt
@@ -1,8 +1,8 @@
# Generated from cocoa.pro.
# special case:
-find_package(Cups)
-find_package(WrapOpenGL)
+qt_find_package(Cups PROVIDED_TARGETS Cups::Cups)
+qt_find_package(WrapOpenGL PROVIDED_TARGETS WrapOpenGL)
#####################################################################
## qcocoa Plugin:
diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt
index 5a4639ddd3..b69f06a499 100644
--- a/src/plugins/platforms/eglfs/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/CMakeLists.txt
@@ -1,5 +1,5 @@
-find_package(EGL)
-find_package(WrapOpenGL)
+qt_find_package(EGL) # special case
+qt_find_package(WrapOpenGL PROVIDED_TARGETS WrapOpenGL) # special case
#####################################################################
## EglFSDeviceIntegration Module:
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
index 09a9560f80..214b13be2e 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
@@ -1,7 +1,7 @@
# Generated from eglfs_kms.pro.
-find_package(gbm)
-find_package(Libdrm)
+qt_find_package(gbm)
+qt_find_package(Libdrm)
#####################################################################
## qeglfs-kms-integration Plugin:
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
index 9dc5d84523..526c75a882 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
@@ -1,6 +1,6 @@
# Generated from eglfs_kms_egldevice.pro.
-find_package(Libdrm)
+qt_find_package(Libdrm)
#####################################################################
## qeglfs-kms-egldevice-integration Plugin:
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
index f077ceae4a..96cabe9f1e 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
@@ -1,6 +1,6 @@
# Generated from eglfs_kms_support.pro.
-find_package(Libdrm)
+qt_find_package(Libdrm)
#####################################################################
## EglFsKmsSupport Module:
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
index aaa4da9cb3..f4487a7747 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
@@ -1,8 +1,8 @@
# Generated from eglfs_x11.pro.
-find_package(XCB)
-find_package(X11)
-find_package(X11_XCB)
+qt_find_package(XCB)
+qt_find_package(X11)
+qt_find_package(X11_XCB)
#####################################################################
## qeglfs-x11-integration Plugin:
diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt
index 0c3e44e2f1..203a9e3920 100644
--- a/src/plugins/platforms/minimal/CMakeLists.txt
+++ b/src/plugins/platforms/minimal/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(Freetype) # special case
+qt_find_package(Freetype) # special case
#####################################################################
## qminimal Plugin:
diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt
index f42925f632..6fc52355c8 100644
--- a/src/plugins/platforms/minimalegl/CMakeLists.txt
+++ b/src/plugins/platforms/minimalegl/CMakeLists.txt
@@ -1,6 +1,6 @@
# Generated from minimalegl.pro.
-find_package(WrapOpenGL)
+qt_find_package(WrapOpenGL PROVIDED_TARGETS WrapOpenGL) # special case
#####################################################################
## qminimalegl Plugin:
diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt
index 646d9f1976..413599e6c5 100644
--- a/src/plugins/platforms/xcb/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/CMakeLists.txt
@@ -1,13 +1,13 @@
# Generated from xcb_qpa_lib.pro.
# special case:
-find_package(X11_XCB)
-find_package(X11)
-find_package(XCB)
-find_package(XKB)
-find_package(PkgConfig)
-find_package(Freetype)
-find_package(GLIB2)
+qt_find_package(X11_XCB)
+qt_find_package(X11)
+qt_find_package(XCB)
+qt_find_package(XKB)
+qt_find_package(PkgConfig)
+qt_find_package(Freetype)
+qt_find_package(GLIB2)
pkg_check_modules(XKB_COMMON_X11 xkbcommon-x11>=0.4.1 IMPORTED_TARGET) # special case
diff --git a/src/plugins/platformthemes/gtk3/CMakeLists.txt b/src/plugins/platformthemes/gtk3/CMakeLists.txt
index 18bf562970..af11ddb80a 100644
--- a/src/plugins/platformthemes/gtk3/CMakeLists.txt
+++ b/src/plugins/platformthemes/gtk3/CMakeLists.txt
@@ -1,7 +1,7 @@
# Generated from gtk3.pro.
-find_package(GTK3)
-find_package(X11)
+qt_find_package(GTK3)
+qt_find_package(X11)
#####################################################################
## qgtk3 Plugin:
diff --git a/src/plugins/printsupport/cups/CMakeLists.txt b/src/plugins/printsupport/cups/CMakeLists.txt
index d36a5e7be5..7adf3e72ea 100644
--- a/src/plugins/printsupport/cups/CMakeLists.txt
+++ b/src/plugins/printsupport/cups/CMakeLists.txt
@@ -1,6 +1,6 @@
# Generated from cups.pro.
-find_package(Cups)
+qt_find_package(Cups PROVIDED_TARGETS Cups::Cups) # special case
#####################################################################
## cupsprintersupport Plugin:
diff --git a/src/plugins/sqldrivers/configure.cmake b/src/plugins/sqldrivers/configure.cmake
index 41a66197d1..9f0b0dfc7e 100644
--- a/src/plugins/sqldrivers/configure.cmake
+++ b/src/plugins/sqldrivers/configure.cmake
@@ -6,11 +6,11 @@
#### Libraries
-find_package(PostgreSQL)
+qt_find_package(PostgreSQL PROVIDED_TARGETS PostgreSQL::PostgreSQL)
set_package_properties(PostgreSQL PROPERTIES TYPE OPTIONAL)
-find_package(ODBC)
+qt_find_package(ODBC PROVIDED_TARGETS ODBC::ODBC)
set_package_properties(ODBC PROPERTIES TYPE OPTIONAL)
-find_package(SQLite3)
+qt_find_package(SQLite3)
set_package_properties(SQLite3 PROPERTIES TYPE OPTIONAL)
diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt
index c3c52f526c..4cfbe3b307 100644
--- a/src/plugins/sqldrivers/odbc/CMakeLists.txt
+++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(ODBC) # special case
+qt_find_package(ODBC) # special case
#####################################################################
## qsqlodbc Plugin:
diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
index dfbeaba6de..7b854c365f 100644
--- a/src/plugins/sqldrivers/psql/CMakeLists.txt
+++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
@@ -1,7 +1,7 @@
# FIXME cmake FindPostgreSQL is more exhaustive than the check we have for libpq-fe.h
# it also checks for catalog/pg_type.h which is a more internal include, we should
# add a way to tell cmake FindPostgreSQL to optionally only look for the libpq-fe.h one
-find_package(PostgreSQL) # special case
+qt_find_package(PostgreSQL) # special case
#####################################################################
## qsqlpsql Plugin: