Update add_custom_command and add_custom_target dependencies

If we don't add the executable used by the custom_target and/or
custom_command to list of the command's/target's dependencies
(DEPENDS) the generated file will not update should the executable
change.

Change-Id: Idce30f3dd4f756d9e8f6848c5e16f5dd6c7c8f0a
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

3 files changed, 25 insertions, 9 deletions

diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
index 446926cd73..21910078ea 100644
--- a/src/corelib/Qt6CoreMacros.cmake
+++ b/src/corelib/Qt6CoreMacros.cmake
@@ -270,9 +270,16 @@ function(qt6_add_binary_resources target )
     endforeach()
 
     add_custom_command(OUTPUT ${rcc_destination}
+                       DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::rcc
                        COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::rcc
                        ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles}
-                       DEPENDS ${rc_depends} ${out_depends} ${infiles} VERBATIM)
+                       DEPENDS
+                            ${QT_CMAKE_EXPORT_NAMESPACE}::rcc
+                            ${rc_depends}
+                            ${out_depends}
+                            ${infiles}
+                       VERBATIM)
+
     add_custom_target(${target} ALL DEPENDS ${rcc_destination})
 endfunction()
 
@@ -324,7 +331,8 @@ function(qt6_add_resources outfiles )
                                COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::rcc
                                ARGS ${rcc_options} --name ${outfilename} --output ${outfile} ${infile}
                                MAIN_DEPENDENCY ${infile}
-                               DEPENDS ${_rc_depends} "${_out_depends}" VERBATIM)
+                               DEPENDS ${_rc_depends} "${_out_depends}" ${QT_CMAKE_EXPORT_NAMESPACE}::rcc
+                               VERBATIM)
             set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC ON)
             set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOUIC ON)
             list(APPEND ${outfiles} ${outfile})
@@ -377,7 +385,8 @@ function(qt6_add_big_resources outfiles )
         set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
         add_custom_command(OUTPUT ${tmpoutfile}
                            COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::rcc ${rcc_options} --name ${outfilename} --pass 1 --output ${tmpoutfile} ${infile}
-                           DEPENDS ${infile} ${_rc_depends} "${out_depends}" VERBATIM)
+                           DEPENDS ${infile} ${_rc_depends} "${out_depends}" ${QT_CMAKE_EXPORT_NAMESPACE}::rcc
+                           VERBATIM)
         add_custom_target(big_resources_${outfilename} ALL DEPENDS ${tmpoutfile})
         add_library(rcc_object_${outfilename} OBJECT ${tmpoutfile})
         set_target_properties(rcc_object_${outfilename} PROPERTIES AUTOMOC OFF)
@@ -388,7 +397,7 @@ function(qt6_add_big_resources outfiles )
         add_custom_command(OUTPUT ${outfile}
                            COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::rcc
                            ARGS ${rcc_options} --name ${outfilename} --pass 2 --temp $<TARGET_OBJECTS:rcc_object_${outfilename}> --output ${outfile} ${infile}
-                           DEPENDS rcc_object_${outfilename}
+                           DEPENDS rcc_object_${outfilename} ${QT_CMAKE_EXPORT_NAMESPACE}::rcc
                            VERBATIM)
        list(APPEND ${outfiles} ${outfile})
     endforeach()
@@ -745,6 +754,7 @@ function(qt6_generate_meta_types_json_file target)
     set(type_list_file "${target_binary_dir}/meta_types/json_file_list.txt")
 
     add_custom_target(${target}_automoc_json_extraction
+        DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::cmake_automoc_parser
         BYPRODUCTS ${type_list_file}
         COMMAND
             ${QT_CMAKE_EXPORT_NAMESPACE}::cmake_automoc_parser
@@ -771,7 +781,7 @@ function(qt6_generate_meta_types_json_file target)
     set(metatypes_dep_file "${target_binary_dir}/meta_types/${metatypes_dep_file_name}")
 
     add_custom_command(OUTPUT ${metatypes_file}
-        DEPENDS ${type_list_file}
+        DEPENDS ${type_list_file} ${QT_CMAKE_EXPORT_NAMESPACE}::moc
         COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::moc
             -o ${metatypes_file}
             --collect-json "@${type_list_file}"
diff --git a/src/dbus/Qt6DBusMacros.cmake b/src/dbus/Qt6DBusMacros.cmake
index 85de817a0b..d7bba30148 100644
--- a/src/dbus/Qt6DBusMacros.cmake
+++ b/src/dbus/Qt6DBusMacros.cmake
@@ -59,7 +59,9 @@ function(qt6_add_dbus_interface _sources _interface _basename)
 
     add_custom_command(OUTPUT "${_impl}" "${_header}"
         COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp ${_params} -p ${_basename} ${_infile}
-        DEPENDS ${_infile} VERBATIM)
+        DEPENDS ${_infile} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml
+        VERBATIM
+    )
 
     set_source_files_properties("${_impl}" "${_header}" PROPERTIES SKIP_AUTOMOC TRUE)
 
@@ -134,7 +136,8 @@ function(qt6_generate_dbus_interface _header) # _customName OPTIONS -some -optio
 
     add_custom_command(OUTPUT ${_target}
         COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml ${_DBUS_INTERFACE_OPTIONS} ${_in_file} -o ${_target}
-        DEPENDS ${_in_file} VERBATIM
+        DEPENDS ${_in_file} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml
+        VERBATIM
     )
 endfunction()
 
@@ -168,12 +171,14 @@ function(qt6_add_dbus_adaptor _sources _xml_file _include _parentClass) # _optio
     if(_optionalClassName)
         add_custom_command(OUTPUT "${_impl}" "${_header}"
           COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp -m -a ${_basename} -c ${_optionalClassName} -i ${_include} -l ${_parentClass} ${_infile}
-          DEPENDS ${_infile} VERBATIM
+          DEPENDS ${_infile} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml
+          VERBATIM
         )
     else()
         add_custom_command(OUTPUT "${_impl}" "${_header}"
           COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qdbusxml2cpp -m -a ${_basename} -i ${_include} -l ${_parentClass} ${_infile}
-          DEPENDS ${_infile} VERBATIM
+          DEPENDS ${_infile} ${QT_CMAKE_EXPORT_NAMESPACE}::qdbuscpp2xml
+          VERBATIM
         )
     endif()
 
diff --git a/src/widgets/Qt6WidgetsMacros.cmake b/src/widgets/Qt6WidgetsMacros.cmake
index 5b0f2e700f..aa8133ba47 100644
--- a/src/widgets/Qt6WidgetsMacros.cmake
+++ b/src/widgets/Qt6WidgetsMacros.cmake
@@ -56,6 +56,7 @@ function(qt6_wrap_ui outfiles )
         get_filename_component(infile ${it} ABSOLUTE)
         set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
         add_custom_command(OUTPUT ${outfile}
+          DEPENDS ${QT_CMAKE_EXPORT_NAMESPACE}::uic
           COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::uic
           ARGS ${ui_options} -o ${outfile} ${infile}
           MAIN_DEPENDENCY ${infile} VERBATIM)