From 05edf4b39cc4dc9dced35409f29975ac086920d2 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 8 Jul 2022 17:11:59 +0200 Subject: [PATCH] CMake: Clarify qt_record_extra_third_party_dependency docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I458a5b488741c639650c8b3b6668c82c80b5e93f Reviewed-by: Alexey Edelev Reviewed-by: Jörg Bornemann (cherry picked from commit 0d1c16861a3761e28ee64eece215e4e5f2256bae) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtFindPackageHelpers.cmake | 2 ++ cmake/QtTargetHelpers.cmake | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/QtFindPackageHelpers.cmake b/cmake/QtFindPackageHelpers.cmake index 07749ebf107..82d141f124e 100644 --- a/cmake/QtFindPackageHelpers.cmake +++ b/cmake/QtFindPackageHelpers.cmake @@ -284,6 +284,8 @@ endfunction() # Needed to record a dependency on the package that provides WrapVulkanHeaders::WrapVulkanHeaders. # The package version, components, whether the package is optional, etc, are queried from the # ${dep_target} target properties. +# Usually these are set at the qt_find_package() call site of a configure.cmake file e.g. using +# Qt's MARK_OPTIONAL option. function(qt_record_extra_third_party_dependency main_target_name dep_target) if(NOT TARGET "${main_target_name}") qt_get_tool_target_name(main_target_name "${main_target_name}") diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake index 246f8fbd2d4..c9217593085 100644 --- a/cmake/QtTargetHelpers.cmake +++ b/cmake/QtTargetHelpers.cmake @@ -850,7 +850,7 @@ endfunction() # To achieve that, consumers of ${target} will only get the include directories of ${dep_target} # if the latter package and target exists. # -# A find_package(dep_target) dependency is added to ${target}'s ModuleDependencies.cmake file. +# A find_package(dep_target) dependency is added to ${target}'s *Dependencies.cmake file. # # We use target_include_directories(PRIVATE) instead of target_link_libraries(PRIVATE) because the # latter would propagate a mandatory LINK_ONLY dependency on the ${dep_target} in a static Qt build.