From 3f6041a24fe9b663e6a00481a30e84b2cd15763c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 4 Jul 2023 18:34:54 +0200 Subject: [PATCH] CMake: Add missing check for tool target promotion We shouldn't try to promote tool targets if they were not created when Qt6FooTools_FOUND is FALSE due to missing dependencies and Qt6FooToolsTargets.cmake is not included. Add a check for Qt6FooTools_FOUND to prevent errors like: CMake Error at lib/cmake/Qt6/QtPublicTargetHelpers.cmake:257 (get_property): get_property could not find TARGET Qt6::qtprotobufgen. Perhaps it has not yet been created. Pick-to: 6.5 6.6 Change-Id: Ie26db637d4d8ef682a0ada5ea36ef0e8ceced008 Reviewed-by: Joerg Bornemann Reviewed-by: Alexey Edelev --- cmake/QtToolHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtToolHelpers.cmake b/cmake/QtToolHelpers.cmake index 94b200ac10f..3be629ad678 100644 --- a/cmake/QtToolHelpers.cmake +++ b/cmake/QtToolHelpers.cmake @@ -348,7 +348,7 @@ function(qt_export_tools module_name) string(REGEX REPLACE "_native$" "" tool_name ${tool_name}) endif() set(extra_cmake_statements "${extra_cmake_statements} -if (NOT QT_NO_CREATE_TARGETS) +if(NOT QT_NO_CREATE_TARGETS AND ${INSTALL_CMAKE_NAMESPACE}${target}_FOUND) __qt_internal_promote_target_to_global(${INSTALL_CMAKE_NAMESPACE}::${tool_name}) endif() ")