diff options
| author | Joerg Bornemann <[email protected]> | 2025-01-06 11:15:12 +0100 |
|---|---|---|
| committer | Joerg Bornemann <[email protected]> | 2025-01-08 21:24:15 +0100 |
| commit | 2d38af3125d18255007f7451f31e26e9c16af45a (patch) | |
| tree | 1b81136dad1c1b8431cca860ec571b278b3266a4 | |
| parent | e7816586b612050adf0cd872b81d04b606ec2b54 (diff) | |
CMake: Simplify Qt6FooPrivate -> Qt6Foo package dependency setup
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.
Pick-to: 6.9
Task-number: QTBUG-87776
Change-Id: I08a48954576dc3c0b6fde809f90d2022201d7eb0
Reviewed-by: Alexey Edelev <[email protected]>
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 3 | ||||
| -rw-r--r-- | cmake/QtPostProcessHelpers.cmake | 11 |
2 files changed, 5 insertions, 9 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 30f199d8daf..0f4ddf1b7d6 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -340,6 +340,9 @@ function(qt_internal_add_module target) ) set_property(TARGET "${target_private}" APPEND PROPERTY EXPORT_PROPERTIES "${export_properties}") + + # Let find_package(Qt6FooPrivate) also find_package(Qt6Foo). + qt_register_target_dependencies("${target_private}" "Qt::${target}" "") endif() # FIXME: This workaround is needed because the deployment logic diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake index 6d8806f84ff..c13a7bfe08f 100644 --- a/cmake/QtPostProcessHelpers.cmake +++ b/cmake/QtPostProcessHelpers.cmake @@ -142,9 +142,7 @@ endfunction() function(qt_internal_create_module_depends_file target) set(no_value_options "") set(single_value_options "") - set(multi_value_options - EXTRA_PACKAGE_DEPENDENCIES - ) + set(multi_value_options "") cmake_parse_arguments(PARSE_ARGV 1 arg "${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$") list(APPEND target_deps "${extra_depends}") 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. 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}) qt_internal_create_module_depends_file(${target}) if(TARGET "${target}Private") - qt_internal_create_module_depends_file(${target}Private - EXTRA_PACKAGE_DEPENDENCIES "${INSTALL_CMAKE_NAMESPACE}${target};${PROJECT_VERSION}" - ) + qt_internal_create_module_depends_file(${target}Private) endif() endforeach() |