From cdda7d044dfaf22f1916a820c08ce36d30555ff8 Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Sun, 16 Mar 2025 01:56:37 +0100
Subject: [PATCH] Qt4Macros: Replace obsolete/deprecated
 macro_add_file_dependencies()

The MacroAddFileDependencies module is deprecated as of CMake 3.14 but
doesn't emit warnings/deprecation notices yet. This for now only
upgrades the code usage of Qt4Macros module when used with FindQt4
without this deprecated module.

Additionally, the lowercase style is used in the documentation.
---
 Modules/FindQt4.cmake                  | 4 +++-
 Modules/MacroAddFileDependencies.cmake | 2 +-
 Modules/Qt4Macros.cmake                | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index e7c0fe263d..dfa0c4e6ee 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -333,10 +333,12 @@ endif()
 
 
 include(${CMAKE_CURRENT_LIST_DIR}/CheckCXXSymbolExists.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/MacroAddFileDependencies.cmake)
 include(FindPackageHandleStandardArgs)
 include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake)
 
+# Included for backward compatibility, otherwise unused.
+include(${CMAKE_CURRENT_LIST_DIR}/MacroAddFileDependencies.cmake)
+
 set(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
 
 set( QT_DEFINITIONS "")
diff --git a/Modules/MacroAddFileDependencies.cmake b/Modules/MacroAddFileDependencies.cmake
index 80f7b3264a..9dee09d3ed 100644
--- a/Modules/MacroAddFileDependencies.cmake
+++ b/Modules/MacroAddFileDependencies.cmake
@@ -9,7 +9,7 @@ MacroAddFileDependencies
 
 .. code-block:: cmake
 
-  MACRO_ADD_FILE_DEPENDENCIES(<source> <files>...)
+  macro_add_file_dependencies(<source> <files>...)
 
 Do not use this command in new code.  It is just a wrapper around:
 
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index eee413bcdd..09d3bcf13b 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -280,7 +280,7 @@ macro(QT4_ADD_DBUS_INTERFACE _sources _interface _basename)
   QT4_GENERATE_MOC("${_header}" "${_moc}")
 
   list(APPEND ${_sources} "${_impl}" "${_header}" "${_moc}")
-  MACRO_ADD_FILE_DEPENDENCIES("${_impl}" "${_moc}")
+  set_property(SOURCE "${_impl}" APPEND PROPERTY OBJECT_DEPENDS "${_moc}")
 
 endmacro()
 
@@ -361,7 +361,7 @@ macro(QT4_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optional
   QT4_GENERATE_MOC("${_header}" "${_moc}")
   set_property(SOURCE ${_impl} PROPERTY SKIP_AUTOMOC TRUE)  # don't run automoc on this file
   set_property(SOURCE ${_impl} PROPERTY SKIP_AUTOUIC TRUE)  # don't run autouic on this file
-  MACRO_ADD_FILE_DEPENDENCIES("${_impl}" "${_moc}")
+  set_property(SOURCE "${_impl}" APPEND PROPERTY OBJECT_DEPENDS "${_moc}")
 
   list(APPEND ${_sources} "${_impl}" "${_header}" "${_moc}")
 endmacro()
@@ -405,7 +405,7 @@ macro(QT4_AUTOMOC)
           endif()
           set(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
           QT4_CREATE_MOC_COMMAND(${_header} ${_moc} "${_moc_INCS}" "" "")
-          MACRO_ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc})
+          set_property(SOURCE "${_abs_FILE}" APPEND PROPERTY OBJECT_DEPENDS "${_moc}")
         endforeach ()
       endif()
     endif ()