Accept any filepath in llvm_check_source_file_list

[serge-sans-paille]

Summary

llvm_check_source_file_list currently only accepts paths relative to current CMAKE_SOURCE_DIR. Extend it to any path, including absolute ones.

[smeenai]

Could you upload the patch with context (-U9999) please?

[smeenai]

LGTM with the comments addressed.

cmake/modules/LLVMProcessSources.cmake

84–89 ↗

(On Diff #138948)

You should be able to delete this entire block now.

99 ↗

(On Diff #138948)

It's more friendly to display the relative path to the source directory here, rather than the full path.

[serge-sans-paille]

Error message updated.

cmake/modules/LLVMProcessSources.cmake

84–89 ↗

(On Diff #138948)

${entry} is still used in `list(FIND LLVM_OPTIONAL_SOURCES ${entry} idx)`. I don't quite get where LLVM_OPTIONAL_SOURCES is set though.

[smeenai]

cmake/modules/LLVMProcessSources.cmake

99 ↗

(On Diff #138997)

I think ${g} is still gonna be the full path, since it's the result of a glob. You'll need to do an explicit relative path calculation.

[serge-sans-paille]

Error message checked on our codebase without issue. Indeed a relative path looks prettier.

[smeenai]

Sweet, thanks for the update.

[serge-sans-paille]

thanks @smeenai for the review o/

llvm/trunk/cmake/modules/LLVMProcessSources.cmake

function(llvm_process_sources OUT_VAR)
   endif()
 
   set( ${OUT_VAR} ${sources} PARENT_SCOPE )
 endfunction(llvm_process_sources)
 
 
 function(llvm_check_source_file_list)
   cmake_parse_arguments(ARG "" "SOURCE_DIR" "" ${ARGN})
-  set(listed ${ARG_UNPARSED_ARGUMENTS})
+  foreach(l ${ARG_UNPARSED_ARGUMENTS})
+      get_filename_component(fp ${l} REALPATH)
+      list(APPEND listed ${fp})
+  endforeach()
+
   if(ARG_SOURCE_DIR)
     file(GLOB globbed
-         RELATIVE "${CMAKE_CURRENT_LIST_DIR}"
          "${ARG_SOURCE_DIR}/*.c" "${ARG_SOURCE_DIR}/*.cpp")
   else()
     file(GLOB globbed *.c *.cpp)
   endif()
+
   foreach(g ${globbed})
     get_filename_component(fn ${g} NAME)
     if(ARG_SOURCE_DIR)
       set(entry "${g}")
     else()
       set(entry "${fn}")
     endif()
+    get_filename_component(gp ${g} REALPATH)
 
     # Don't reject hidden files. Some editors create backups in the
     # same directory as the file.
     if (NOT "${fn}" MATCHES "^\\.")
       list(FIND LLVM_OPTIONAL_SOURCES ${entry} idx)
       if( idx LESS 0 )
-        list(FIND listed ${entry} idx)
+        list(FIND listed ${gp} idx)
         if( idx LESS 0 )
-          message(SEND_ERROR "Found unknown source file ${g}
+          if(ARG_SOURCE_DIR)
+              set(fn_relative "${ARG_SOURCE_DIR}/${fn}")
+          else()
+              set(fn_relative "${fn}")
+          endif()
+          message(SEND_ERROR "Found unknown source file ${fn_relative}
 Please update ${CMAKE_CURRENT_LIST_FILE}\n")
         endif()
       endif()
     endif()
   endforeach()
 endfunction(llvm_check_source_file_list)