Cleaning up dead/obsolete codepaths

Author: rasky

cmake/common/verify_sources.cmake

@@ -1,31 +1,19 @@
 function(ares_register_verify target target_root)
-  if(NOT TARGET ${target})
-    return()
-  endif()
-
   get_target_property(_srcs ${target} SOURCES)
-  if(NOT _srcs)
-    set(_srcs)
-  endif()
-
-  # Resolve relative source paths against the target's own SOURCE_DIR
   get_target_property(_target_srcdir ${target} SOURCE_DIR)
-  if(NOT _target_srcdir)
-    set(_target_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
-  endif()
 
+  # Create a file with all the declared sources for the target,
+  # converted to absolute paths.
   file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/verify")
   set(_decl "${CMAKE_BINARY_DIR}/verify/${target}-declared.txt")
   file(WRITE "${_decl}" "")
   foreach(_s IN LISTS _srcs)
-    if(NOT IS_ABSOLUTE "${_s}")
-      get_filename_component(_abs "${_s}" REALPATH BASE_DIR "${_target_srcdir}")
-    else()
-      set(_abs "${_s}")
-    endif()
+    get_filename_component(_abs "${_s}" REALPATH BASE_DIR "${_target_srcdir}")
     file(APPEND "${_decl}" "${_abs}\n")
   endforeach()
 
+  # Run the verify_declared_sources.py script to check if all the sources
+  # are declared in as target sources.
   find_package(Python3 COMPONENTS Interpreter QUIET)
   if(Python3_Interpreter_FOUND)
     set(_verify_args "${CMAKE_SOURCE_DIR}/scripts/verify_declared_sources.py"
@@ -56,11 +44,6 @@ endfunction()
 
 function(ares_define_verify_aggregate)
   get_property(_tgts GLOBAL PROPERTY ARES_VERIFY_TARGETS)
-  if(NOT _tgts)
-    add_custom_target(verify-sources COMMAND ${CMAKE_COMMAND} -E echo "No verify targets.")
-    return()
-  endif()
-
   add_custom_target(verify-sources)
   add_dependencies(verify-sources ${_tgts})
 endfunction()

scripts/verify_declared_sources.py

@@ -2,7 +2,6 @@
 import argparse, glob, os, re, sys, subprocess
 from pathlib import Path
 
-
 def parse_depfile(p):
     s = Path(p).read_text(errors='ignore').replace('\\\n', ' ')
     i = s.find(':')
@@ -29,16 +28,6 @@ def parse_depfile(p):
     return [str(Path(x).resolve()) for x in out]
 
 
-def parse_dependinfo(p):
-    txt = Path(p).read_text(errors='ignore')
-    deps = []
-    for m in re.finditer(r'set\(CMAKE_DEPENDS_DEPENDENCY_FILES\s*"([^"]*)"\)', txt):
-        deps.extend(m.group(1).split(';'))
-    for m in re.finditer(r'set\([A-Z_]+_DEPENDS_DEPENDENCY_FILES\s*"([^"]*)"\)', txt):
-        deps.extend(m.group(1).split(';'))
-    return [str(Path(x).resolve()) for x in deps if x]
-
-
 def main():
     ap = argparse.ArgumentParser()
     ap.add_argument('--build-dir', required=True)
@@ -61,12 +50,6 @@ def main():
     ):
         for dep in parse_depfile(d):
             used.add(dep)
-    for d in glob.glob(
-        os.path.join(args.build_dir, f'**/CMakeFiles/**/DependInfo.cmake'),
-        recursive=True,
-    ):
-        for dep in parse_dependinfo(d):
-            used.add(dep)
 
     if args.ninja:
         try: