build: rework the meson cmake dependency patch

Review of mesonbuild/meson#16077 found the previous version silently
dropped every relative source path passed to
set_source_files_properties(), since the CMake trace does not absolutize
them.

Author: LDAP

.github/meson-cmake-generated-deps.patch

@@ -6,56 +6,48 @@
 
 +        # Object dependencies set via set_source_files_properties(... OBJECT_DEPENDS ...),
 +        # mapping the source file to the files its compilation depends on
-+        self.object_depends: T.Dict[str, T.List[str]] = {}
++        self.object_depends: T.Dict[Path, T.List[str]] = {}
 +
          # T.List of targes that were added with add_custom_command to generate files
          self.custom_targets: T.List[CMakeGeneratorTarget] = []
 
-@@ -120,6 +124,7 @@
-             'add_custom_target': self._cmake_add_custom_target,
-             'set_property': self._cmake_set_property,
-             'set_target_properties': self._cmake_set_target_properties,
-+            'set_source_files_properties': self._cmake_set_source_files_properties,
-             'target_compile_definitions': self._cmake_target_compile_definitions,
-             'target_compile_options': self._cmake_target_compile_options,
-             'target_include_directories': self._cmake_target_include_directories,
-@@ -605,6 +610,33 @@
+@@ -525,9 +529,10 @@
+             else:
+                 tgt.properties[identifier] = value
 
-                 self.targets[i].properties[name] = value
+-        def do_source(src: str) -> None:
+-            if identifier != 'HEADER_FILE_ONLY' or not self._str_to_bool(value):
+-                return
++        def resolve_source(src: str) -> Path:
++            src_p = Path(src)
++            if src_p.is_absolute():
++                return src_p
 
-+    def _cmake_set_source_files_properties(self, tline: CMakeTraceLine) -> None:
-+        # DOC: https://cmake.org/cmake/help/latest/command/set_source_files_properties.html
-+        args = list(tline.args)
-+
-+        sources: T.List[str] = []
-+        idx = 0
-+        while idx < len(args) and args[idx] != 'PROPERTIES':
-+            if args[idx] in {'DIRECTORY', 'TARGET_DIRECTORY'}:
-+                # skip the scope arguments
-+                idx += 1
-+                while idx < len(args) and args[idx] not in {'DIRECTORY', 'TARGET_DIRECTORY', 'PROPERTIES'}:
-+                    idx += 1
-+                continue
-+            sources += args[idx].split(';')
-+            idx += 1
-+
-+        object_depends: T.List[str] = []
-+        idx += 1
-+        while idx + 1 < len(args):
-+            if args[idx] == 'OBJECT_DEPENDS':
-+                object_depends += args[idx + 1].split(';')
-+            idx += 2
-+
-+        if object_depends:
-+            for i in sources:
-+                self.object_depends.setdefault(i, []).extend(object_depends)
-+
-     def _cmake_add_dependencies(self, tline: CMakeTraceLine) -> None:
-         # DOC: https://cmake.org/cmake/help/latest/command/add_dependencies.html
-         args = list(tline.args)
+             current_src_dir = self.var_to_str('MESON_PS_CMAKE_CURRENT_SOURCE_DIR')
+             if not current_src_dir:
+@@ -537,12 +542,14 @@
+                 '''))
+                 current_src_dir = '.'
+ 
+-            cur_p = Path(current_src_dir)
+-            src_p = Path(src)
++            return Path(current_src_dir) / src_p
+ 
+-            if not src_p.is_absolute():
+-                src_p = cur_p / src_p
+-            self.explicit_headers.add(src_p)
++        def do_source(src: str) -> None:
++            if identifier == 'HEADER_FILE_ONLY':
++                if self._str_to_bool(value):
++                    self.explicit_headers.add(resolve_source(src))
++            elif identifier == 'OBJECT_DEPENDS':
++                self.object_depends.setdefault(resolve_source(src), []).extend(value)
+ 
+         if scope == 'TARGET':
+             for i in targets:
 --- a/mesonbuild/cmake/interpreter.py
 +++ b/mesonbuild/cmake/interpreter.py
-@@ -382,6 +382,21 @@
+@@ -382,6 +382,18 @@
          elif self.type.upper() not in ['EXECUTABLE', 'OBJECT_LIBRARY']:
              mlog.warning('CMake: Target', mlog.bold(self.cmake_name), 'not found in CMake trace. This can lead to build errors')
 
@@ -68,16 +60,13 @@
 +                p = x if x.is_absolute() else self.src_dir / x
 +                src_keys.add(p.resolve().as_posix())
 +            for src, deps in trace.object_depends.items():
-+                src_path = Path(src)
-+                if not src_path.is_absolute():
-+                    continue
-+                if src_path.resolve().as_posix() in src_keys:
++                if src.resolve().as_posix() in src_keys:
 +                    self.depends_raw += deps
 +
          temp = []
          for cmd in self.link_libraries:
              # Let meson handle this arcane magic
-@@ -503,7 +518,14 @@
+@@ -503,7 +515,14 @@
          for arg in self.depends_raw:
              dep_tgt = output_target_map.target(arg)
              if dep_tgt:
@@ -93,7 +82,7 @@
 
      def process_object_libs(self, obj_target_list: T.List['ConverterTarget'], linker_workaround: bool) -> None:
          # Try to detect the object library(s) from the generated input sources
-@@ -1131,12 +1153,24 @@
+@@ -1131,12 +1150,24 @@
                  if i.name not in processed:
                      process_target(i)
                  objec_libs += [extract_tgt(i)]