From 253a7f95bca62760a6beb0acb4eb9966ebbd113e Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 15 Aug 2025 19:03:48 +0200 Subject: CMake: Don't use private CMake API in doc snippets Private CMake API like qt_internal_extend_target should not be used in public doc snippets. While most of the CMakeLists.txt doc snippets might not appear in the documentation right now, they might in the future (just like the CMake API doc snippets). In addition, using private CMake API for doc snippets targets causes issues with SBOM generation, because the original targets are not created with private API (e.g. qt_internal_add_module vs qt_add_library), and thus important sbom meta information is missing, causing errors at cmake configure time when sbom generation is enabled. Pick-to: 6.8 6.9 6.10 Change-Id: I2ef80f617ba8b745520408d22dd2e6be5ee4c5e0 Reviewed-by: Oleksii Zbykovskyi Reviewed-by: Joerg Bornemann --- src/gui/doc/snippets/code/CMakeLists.txt | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'src/gui/doc/snippets/code') diff --git a/src/gui/doc/snippets/code/CMakeLists.txt b/src/gui/doc/snippets/code/CMakeLists.txt index 7f8897ec8fa..0db976f7c21 100644 --- a/src/gui/doc/snippets/code/CMakeLists.txt +++ b/src/gui/doc/snippets/code/CMakeLists.txt @@ -36,10 +36,11 @@ target_link_libraries(gui_snippets_code PRIVATE Qt::Gui ) -qt_internal_extend_target(gui_snippets_code CONDITION QT_FEATURE_widgets - LIBRARIES +if(QT_FEATURE_widgets) + target_link_libraries(gui_snippets_code PRIVATE Qt::Widgets - SOURCES + ) + target_sources(gui_snippets_code PRIVATE doc_src_coordsys.cpp doc_src_richtext.cpp src_gui_image_qicon.cpp @@ -53,19 +54,22 @@ qt_internal_extend_target(gui_snippets_code CONDITION QT_FEATURE_widgets src_gui_painting_qpainter.cpp src_gui_text_qsyntaxhighlighter.cpp src_gui_util_qvalidator.cpp -) + ) +endif() -qt_internal_extend_target(gui_snippets_code CONDITION QT_FEATURE_vulkan - SOURCES +if(QT_FEATURE_vulkan) + target_sources(gui_snippets_code PRIVATE src_gui_vulkan_qvulkanfunctions.cpp src_gui_vulkan_qvulkaninstance.cpp src_gui_vulkan_qvulkanwindow.cpp -) + ) +endif() -qt_internal_extend_target(gui_snippets_code CONDITION QT_FEATURE_clipboard - SOURCES +if(QT_FEATURE_clipboard) + target_sources(gui_snippets_code PRIVATE src_gui_kernel_qclipboard.cpp -) + ) +endif() set_target_properties(gui_snippets_code PROPERTIES COMPILE_OPTIONS "-w") -- cgit v1.2.3