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

CMake: Simplify Qt6FooPrivate -> Qt6Foo package dependency setup

Browse Source 
This amends commit fbbf4ace0188b9718b6d7808021c0b887fd52d9f.

Remove the EXTRA_PACKAGE_DEPENDENCIES argument that was added in
mentioned commit, and use the qt_register_target_dependencies function
instead to add the package dependency Qt6FooPrivate -> Qt6Foo.

Task-number: QTBUG-87776
Change-Id: I08a48954576dc3c0b6fde809f90d2022201d7eb0
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 2d38af3125d18255007f7451f31e26e9c16af45a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Joerg Bornemann 2025-01-06 11:15:12 +01:00 committed by Qt Cherry-pick Bot
parent 58113ca96e
commit 83cb2ca344
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/QtModuleHelpers.cmake
View File

@ -340,6 +340,9 @@ function(qt_internal_add_module target)
) )
set_property(TARGET "${target_private}" APPEND PROPERTY set_property(TARGET "${target_private}" APPEND PROPERTY
EXPORT_PROPERTIES "${export_properties}") EXPORT_PROPERTIES "${export_properties}")
# Let find_package(Qt6FooPrivate) also find_package(Qt6Foo).
qt_register_target_dependencies("${target_private}" "Qt::${target}" "")
endif() endif()
# FIXME: This workaround is needed because the deployment logic # FIXME: This workaround is needed because the deployment logic

11
cmake/QtPostProcessHelpers.cmake
View File

@ -142,9 +142,7 @@ endfunction()
function(qt_internal_create_module_depends_file target) function(qt_internal_create_module_depends_file target)
set(no_value_options "") set(no_value_options "")
set(single_value_options "") set(single_value_options "")
set(multi_value_options set(multi_value_options "")
EXTRA_PACKAGE_DEPENDENCIES
)
cmake_parse_arguments(PARSE_ARGV 1 arg cmake_parse_arguments(PARSE_ARGV 1 arg
"${no_value_options}" "${single_value_options}" "${multi_value_options}" "${no_value_options}" "${single_value_options}" "${multi_value_options}"
) )
@ -174,9 +172,6 @@ function(qt_internal_create_module_depends_file target)
if(NOT extra_depends MATCHES "-NOTFOUND$") if(NOT extra_depends MATCHES "-NOTFOUND$")
list(APPEND target_deps "${extra_depends}") list(APPEND target_deps "${extra_depends}")
endif() endif()
if(DEFINED arg_EXTRA_PACKAGE_DEPENDENCIES)
list(APPEND target_deps "${arg_EXTRA_PACKAGE_DEPENDENCIES}")
endif()
# Extra 3rd party targets who's packages should be considered dependencies. # Extra 3rd party targets who's packages should be considered dependencies.
get_target_property(extra_third_party_deps "${target}" _qt_extra_third_party_dep_targets) get_target_property(extra_third_party_deps "${target}" _qt_extra_third_party_dep_targets)
@ -470,9 +465,7 @@ function(qt_internal_create_depends_files)
foreach (target ${repo_known_modules}) foreach (target ${repo_known_modules})
qt_internal_create_module_depends_file(${target}) qt_internal_create_module_depends_file(${target})
if(TARGET "${target}Private") if(TARGET "${target}Private")
qt_internal_create_module_depends_file(${target}Private qt_internal_create_module_depends_file(${target}Private)
EXTRA_PACKAGE_DEPENDENCIES "${INSTALL_CMAKE_NAMESPACE}${target};${PROJECT_VERSION}"
)
endif() endif()
endforeach() endforeach()