diff options
| author | Jean-Michaël Celerier <jeanmichael.celerier@gmail.com> | 2019-05-03 09:31:19 +0200 |
|---|---|---|
| committer | Jean-Michaël Celerier <jean-michael.celerier@kdab.com> | 2019-05-03 08:11:19 +0000 |
| commit | db5f99f4513c759bdd971f881ef2046fca72e42f (patch) | |
| tree | 056a3b1c457ee7a0ea7902e7e89c81d89e82b7ce | |
| parent | d3b10dabf20d369d4967cbdb4a8d6cb9993705bc (diff) | |
cmake: make the qt_find_package PROVIDED_TARGETS optional
This is because some FindPackage may produce some targets only on some
platforms - e.g. qt_find_package(OpenGL) needs to define
the provided target OpenGL::GLX which will only exist on linux but
is required by various CMakeLists.txt files.
Change-Id: I74515470f5d56c246f489df74901ad4223a92a70
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | cmake/QtBuild.cmake | 2 | ||||
| -rw-r--r-- | src/gui/configure.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index ddf6389db1d..f23c21901f9 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1428,7 +1428,7 @@ macro(qt_find_package) IMPORTED_GLOBAL TRUE) endif() else() - message(FATAL_ERROR + message(AUTHOR_WARNING "Error while trying to mark target '${qt_find_package_target_name}' as part" " of the ${ARGV0} package. Provided target name does not exist.") endif() diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 81e1b31620c..542460a889f 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -44,7 +44,7 @@ qt_find_package(PNG PROVIDED_TARGETS PNG::PNG) set_package_properties(PNG PROPERTIES TYPE OPTIONAL) qt_find_package(Mtdev PROVIDED_TARGETS PkgConfig::Mtdev) set_package_properties(Mtdev PROPERTIES TYPE OPTIONAL) -qt_find_package(OpenGL) +qt_find_package(OpenGL PROVIDED_TARGETS OpenGL::GL OpenGL::OpenGL OpenGL::EGL OpenGL::GLX OpenGL::GLU) set_package_properties(OpenGL PROPERTIES TYPE OPTIONAL) qt_find_package(GLESv2) set_package_properties(GLESv2 PROPERTIES TYPE OPTIONAL) |