From 8af4ad568e45a5c41654519d4fb1fee2a45e06b8 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 18 Aug 2023 13:53:44 +0200 Subject: [PATCH] CMake: Don't create superfluous qtrepo_XXX_for_examples targets Only create a qtrepo_src_for_examples target that examples, built as external projects, can depend on. Change-Id: I334bc67b9b78f49d5c345cb256132f42dc2c5f5e Reviewed-by: Alexandru Croitor Reviewed-by: Alexey Edelev (cherry picked from commit e05b779c88c63b3efc15b5cb29f3c13ec22f1c48) --- .../QtBuildInternalsConfig.cmake | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 036a14af1c2..95a372f56c3 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -302,21 +302,23 @@ function(qt_build_internals_add_toplevel_targets) # Create special dependency target for External Project examples excluding targets # marked as skipped. - set(qt_repo_target_name - "${qt_repo_targets_name}_${qt_repo_target_basename}_for_examples") - add_custom_target("${qt_repo_target_name}") + if(qt_repo_target_basename STREQUAL "src") + set(qt_repo_target_name + "${qt_repo_targets_name}_${qt_repo_target_basename}_for_examples") + add_custom_target("${qt_repo_target_name}") - set(unskipped_targets "") - foreach(target IN LISTS qt_repo_targets) - if(TARGET "${target}") - qt_internal_is_target_skipped_for_examples("${target}" is_skipped) - if(NOT is_skipped) - list(APPEND unskipped_targets "${target}") + set(unskipped_targets "") + foreach(target IN LISTS qt_repo_targets) + if(TARGET "${target}") + qt_internal_is_target_skipped_for_examples("${target}" is_skipped) + if(NOT is_skipped) + list(APPEND unskipped_targets "${target}") + endif() endif() + endforeach() + if(unskipped_targets) + add_dependencies("${qt_repo_target_name}" ${unskipped_targets}) endif() - endforeach() - if(unskipped_targets) - add_dependencies("${qt_repo_target_name}" ${unskipped_targets}) endif() endif()