1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce _qt_internal_append_cmake_configure_depends

Browse Source 
The function append the unique entries to the CMAKE_CONFIGURE_DEPENDS
property. This suppress the ninja recompat issue, which complains
about the duplicated entries in that come from the
CMAKE_CONFIGURE_DEPENDS property. It's likely the CMake issue, but
we may work around it.

Pick-to: 6.8 6.9 6.10
Change-Id: I2f10834b0dca3d2aa08fe13fba69849e97fa77d0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2025-03-11 13:48:28 +01:00
parent 1bcfbfa3bc
commit 1f10cd4b45
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtBaseGlobalTargets.cmake
View File

@ -85,7 +85,7 @@ if(QT_WILL_INSTALL)
endforeach() endforeach()
endif() endif()
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS _qt_internal_append_cmake_configure_depends(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/QtBuildInternals/${__build_internals_standalone_test_template_dir}/CMakeLists.txt" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/QtBuildInternals/${__build_internals_standalone_test_template_dir}/CMakeLists.txt"
${__build_internals_extra_files} ${__build_internals_extra_files}
) )

2
cmake/QtModuleHelpers.cmake
View File

@ -807,7 +807,7 @@ set(QT_ALLOW_MISSING_TOOLS_PACKAGES TRUE)")
) )
# Make sure touched extra cmake files cause a reconfigure, so they get re-copied. # Make sure touched extra cmake files cause a reconfigure, so they get re-copied.
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${cmake_file}") _qt_internal_append_cmake_configure_depends("${cmake_file}")
endforeach() endforeach()
list(APPEND extra_cmake_includes ${arg_EXTRA_CMAKE_INCLUDES}) list(APPEND extra_cmake_includes ${arg_EXTRA_CMAKE_INCLUDES})

12
cmake/QtPublicCMakeHelpers.cmake
View File

@ -956,3 +956,15 @@ function(_qt_internal_is_c_identifier out_var value)
set(${out_var} "FALSE" PARENT_SCOPE) set(${out_var} "FALSE" PARENT_SCOPE)
endif() endif()
endfunction() endfunction()
# Makes appending of the CMake configure time dependencies unique.
function(_qt_internal_append_cmake_configure_depends)
get_property(configure_depends DIRECTORY PROPERTY CMAKE_CONFIGURE_DEPENDS)
foreach(path IN LISTS ARGN)
get_filename_component(abs_path "${path}" REALPATH)
if(NOT "${abs_path}" IN_LIST configure_depends)
list(APPEND configure_depends "${abs_path}")
endif()
endforeach()
set_property(DIRECTORY PROPERTY CMAKE_CONFIGURE_DEPENDS "${configure_depends}")
endfunction()

3
cmake/QtPublicSbomHelpers.cmake
View File

@ -432,8 +432,7 @@ function(_qt_internal_sbom_end_project)
# Add configure-time dependency on project attribution files. # Add configure-time dependency on project attribution files.
get_property(attribution_files GLOBAL PROPERTY _qt_internal_project_attribution_files) get_property(attribution_files GLOBAL PROPERTY _qt_internal_project_attribution_files)
list(REMOVE_DUPLICATES attribution_files) _qt_internal_append_cmake_configure_depends(${attribution_files})
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${attribution_files}")
endfunction() endfunction()
# Automatically begins sbom generation for a qt git repo unless QT_SKIP_SBOM_AUTO_PROJECT is TRUE. # Automatically begins sbom generation for a qt git repo unless QT_SKIP_SBOM_AUTO_PROJECT is TRUE.

2
doc/CMakeLists.txt
View File

@ -19,7 +19,7 @@ foreach(dir global config)
# dependencies should be set up in that case (coarsness, use install vs build dirs, # dependencies should be set up in that case (coarsness, use install vs build dirs,
# etc). # etc).
file(GLOB_RECURSE files LIST_DIRECTORIES FALSE "${dir}/*") file(GLOB_RECURSE files LIST_DIRECTORIES FALSE "${dir}/*")
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${files}) _qt_internal_append_cmake_configure_depends(${files})
endif() endif()
endif() endif()
endforeach() endforeach()