[Mlir-commits] [mlir] 5af8cec - Revert "Fix CMake dependencies on mlir-linalg-ods-yaml-gen (#111973)"

[Thomas Preud'homme]

Author: Thomas Preud'homme
Date: 2024-10-14T11:58:23+01:00
New Revision: 5af8cec8b51b57da182f6b24be4f623033d132c9

URL: https://github.com/llvm/llvm-project/commit/5af8cec8b51b57da182f6b24be4f623033d132c9
DIFF: https://github.com/llvm/llvm-project/commit/5af8cec8b51b57da182f6b24be4f623033d132c9.diff

LOG: Revert "Fix CMake dependencies on mlir-linalg-ods-yaml-gen (#111973)"

This reverts commit d6827f68ad9110ae0c9992de7b2e2eec0f23be14 due to the
following CMake configure failure being observed by some:

add_custom_target called with invalid target name

Added: 
    

Modified: 
    llvm/cmake/modules/AddLLVM.cmake
    mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
index abffa3ec20386f..c62b5649facae1 100644
--- a/llvm/cmake/modules/AddLLVM.cmake
+++ b/llvm/cmake/modules/AddLLVM.cmake
@@ -2618,7 +2618,7 @@ function(get_host_tool_path tool_name setting_name exe_var_name target_var_name)
     set(target_name "")
   elseif(LLVM_USE_HOST_TOOLS)
     get_native_tool_path(${tool_name} exe_name)
-    set(target_name host_${tool_name})
+    set(target_name ${exe_name})
   else()
     set(exe_name $<TARGET_FILE:${tool_name}>)
     set(target_name ${tool_name})
@@ -2632,8 +2632,8 @@ function(setup_host_tool tool_name setting_name exe_var_name target_var_name)
   # Set up a native tool build if necessary
   if(LLVM_USE_HOST_TOOLS AND NOT ${setting_name})
     build_native_tool(${tool_name} exe_name DEPENDS ${tool_name})
-    add_custom_target(${${target_var_name}} DEPENDS ${exe_name})
+    add_custom_target(${target_var_name} DEPENDS ${exe_name})
     get_subproject_title(subproject_title)
-    set_target_properties(${${target_var_name}} PROPERTIES FOLDER "${subproject_title}/Native")
+    set_target_properties(${target_var_name} PROPERTIES FOLDER "${subproject_title}/Native")
   endif()
 endfunction()

diff  --git a/mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt b/mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt
index 71214b4404c550..289c0e4bbdaf68 100644
--- a/mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt
+++ b/mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt
@@ -15,10 +15,13 @@ function(add_linalg_ods_yaml_gen yaml_ast_file output_file)
     MAIN_DEPENDENCY
     ${YAML_AST_SOURCE}
     DEPENDS
+    ${MLIR_LINALG_ODS_YAML_GEN_EXE}
     ${MLIR_LINALG_ODS_YAML_GEN_TARGET})
   add_custom_target(
     MLIR${output_file}YamlIncGen
     DEPENDS
+    ${MLIR_LINALG_ODS_YAML_GEN_EXE}
+    ${MLIR_LINALG_ODS_YAML_GEN_TARGET}
     ${GEN_ODS_FILE} ${GEN_CPP_FILE})
   set_target_properties(MLIR${output_file}YamlIncGen PROPERTIES FOLDER "MLIR/Tablegenning")
   list(APPEND LLVM_TARGET_DEPENDS ${GEN_ODS_FILE})