1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: make the qt_find_package PROVIDED_TARGETS optional

Browse Source 
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>
This commit is contained in:
Jean-Michaël Celerier 2019-05-03 09:31:19 +02:00 committed by Jean-Michaël Celerier
parent d3b10dabf2
commit db5f99f451
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtBuild.cmake
View File

@ -1428,7 +1428,7 @@ macro(qt_find_package)
IMPORTED_GLOBAL TRUE) IMPORTED_GLOBAL TRUE)
endif() endif()
else() else()
message(FATAL_ERROR message(AUTHOR_WARNING
"Error while trying to mark target '${qt_find_package_target_name}' as part" "Error while trying to mark target '${qt_find_package_target_name}' as part"
" of the ${ARGV0} package. Provided target name does not exist.") " of the ${ARGV0} package. Provided target name does not exist.")
endif() endif()

2
src/gui/configure.cmake
View File

@ -44,7 +44,7 @@ qt_find_package(PNG PROVIDED_TARGETS PNG::PNG)
set_package_properties(PNG PROPERTIES TYPE OPTIONAL) set_package_properties(PNG PROPERTIES TYPE OPTIONAL)
qt_find_package(Mtdev PROVIDED_TARGETS PkgConfig::Mtdev) qt_find_package(Mtdev PROVIDED_TARGETS PkgConfig::Mtdev)
set_package_properties(Mtdev PROPERTIES TYPE OPTIONAL) 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) set_package_properties(OpenGL PROPERTIES TYPE OPTIONAL)
qt_find_package(GLESv2) qt_find_package(GLESv2)
set_package_properties(GLESv2 PROPERTIES TYPE OPTIONAL) set_package_properties(GLESv2 PROPERTIES TYPE OPTIONAL)