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

CMake: Mark PlatformCommonInternal as a Qt6 package

Browse Source 
Add PlatformCommonInternal to the list of packages
compared in qt_internal_is_lib_part_of_qt6_package

It gets rid of the following warnings when configuring
standalone tests

 CMake Warning at cmake/QtFindPackageHelpers.cmake:406 (message):
 Could not find target Qt6::PlatformCommonInternal to query its
 package name. Defaulting to package name Qt6PlatformCommonInternal.
 Consider re-arranging the project structure to ensure the target
 exists by this point.

 CMake Warning at cmake/QtFindPackageHelpers.cmake:374 (message):
 Could not determine package version of target
 PlatformCommonInternal. Defaulting to project version 6.5.0.

Amends 606124c5cceba0dd4a406a9278588b58bb9f9800
Amends dd1030a4501ca067e96f50085c8cfda19d85afd4
Amends dffcc2370e43722afb25d7aec7cd9d6a36f61e03

Pick-to: 6.4
Task-number: QTBUG-104998
Change-Id: I65c23c20b3c1b70dbfd54edd4f5b83c6781f5e6f
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Alexandru Croitor 2022-07-26 17:31:27 +02:00
parent 0e0352ab4d
commit 22c3b87b14
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtFindPackageHelpers.cmake
View File

@ -309,7 +309,9 @@ function(qt_internal_is_lib_part_of_qt6_package lib out_var)
OR lib STREQUAL "GlobalConfigPrivate" OR lib STREQUAL "GlobalConfigPrivate"
OR lib STREQUAL "PlatformModuleInternal" OR lib STREQUAL "PlatformModuleInternal"
OR lib STREQUAL "PlatformPluginInternal" OR lib STREQUAL "PlatformPluginInternal"
OR lib STREQUAL "PlatformToolInternal") OR lib STREQUAL "PlatformToolInternal"
OR lib STREQUAL "PlatformCommonInternal"
)
set(${out_var} "TRUE" PARENT_SCOPE) set(${out_var} "TRUE" PARENT_SCOPE)
else() else()
set(${out_var} "FALSE" PARENT_SCOPE) set(${out_var} "FALSE" PARENT_SCOPE)