diff options
| author | Joerg Bornemann <[email protected]> | 2025-01-03 17:22:45 +0100 |
|---|---|---|
| committer | Joerg Bornemann <[email protected]> | 2025-01-08 20:45:55 +0100 |
| commit | e7816586b612050adf0cd872b81d04b606ec2b54 (patch) | |
| tree | 4468629a87703ba33e201065d0aeade4190cf8ee /cmake/QtPostProcessHelpers.cmake | |
| parent | d58989235265ce47858e30ae1b4c1dc0552521f8 (diff) | |
CMake: Don't export 3rdparty dependency find_package calls
...of private modules in public modules. This isn't necessary anymore
since the Qt6FooPrivateDependencies.cmake files contain these 3rdparty
dependencies proper.
This reverts commit dae078e521c3932c66436cbdbfaf5294a1842901.
This amends commit fbbf4ace0188b9718b6d7808021c0b887fd52d9f.
Pick-to: 6.9
Task-number: QTBUG-87776
Change-Id: I2c425d49fe7beb790abf9a94f089d43fde8b047e
Reviewed-by: Alexandru Croitor <[email protected]>
Diffstat (limited to 'cmake/QtPostProcessHelpers.cmake')
| -rw-r--r-- | cmake/QtPostProcessHelpers.cmake | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake index 974b588822d..6d8806f84ff 100644 --- a/cmake/QtPostProcessHelpers.cmake +++ b/cmake/QtPostProcessHelpers.cmake @@ -29,7 +29,7 @@ macro(qt_collect_third_party_deps target) endif() unset(_target_is_static) - foreach(dep ${${depends_var}} ${optional_public_depends} ${extra_third_party_deps}) + foreach(dep ${${depends_var}} ${extra_third_party_deps}) # Gather third party packages that should be found when using the Qt module. # Also handle nolink target dependencies. string(REGEX REPLACE "_nolink$" "" base_dep "${dep}") @@ -48,9 +48,6 @@ macro(qt_collect_third_party_deps target) if(dep_seen EQUAL -1 AND package_name) list(APPEND third_party_deps_seen ${dep}) get_target_property(package_is_optional ${dep} INTERFACE_QT_PACKAGE_IS_OPTIONAL) - if(NOT package_is_optional AND dep IN_LIST optional_public_depends) - set(package_is_optional TRUE) - endif() get_target_property(package_version ${dep} INTERFACE_QT_PACKAGE_VERSION) if(NOT package_version) set(package_version "") @@ -165,11 +162,6 @@ function(qt_internal_create_module_depends_file target) get_target_property(public_depends "${target}" INTERFACE_LINK_LIBRARIES) - unset(optional_public_depends) - if(TARGET "${target}Private") - get_target_property(optional_public_depends "${target}Private" INTERFACE_LINK_LIBRARIES) - endif() - # Used for collecting Qt module dependencies that should be find_package()'d in # ModuleDependencies.cmake. get_target_property(target_deps "${target}" _qt_target_deps) @@ -349,7 +341,6 @@ function(qt_internal_create_plugin_depends_file target) get_target_property(depends "${target}" LINK_LIBRARIES) get_target_property(public_depends "${target}" INTERFACE_LINK_LIBRARIES) get_target_property(target_deps "${target}" _qt_target_deps) - unset(optional_public_depends) set(target_deps_seen "") @@ -410,7 +401,6 @@ function(qt_internal_create_qt6_dependencies_file) set(actual_target Platform) get_target_property(public_depends "${actual_target}" INTERFACE_LINK_LIBRARIES) unset(depends) - unset(optional_public_depends) set(third_party_deps "") set(third_party_deps_seen "") |