Skip to content

Commit 5af8cec

Browse files
committed
Revert "Fix CMake dependencies on mlir-linalg-ods-yaml-gen (llvm#111973)"
This reverts commit d6827f6 due to the following CMake configure failure being observed by some: add_custom_target called with invalid target name
1 parent c5f82f7 commit 5af8cec

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

llvm/cmake/modules/AddLLVM.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2618,7 +2618,7 @@ function(get_host_tool_path tool_name setting_name exe_var_name target_var_name)
26182618
set(target_name "")
26192619
elseif(LLVM_USE_HOST_TOOLS)
26202620
get_native_tool_path(${tool_name} exe_name)
2621-
set(target_name host_${tool_name})
2621+
set(target_name ${exe_name})
26222622
else()
26232623
set(exe_name $<TARGET_FILE:${tool_name}>)
26242624
set(target_name ${tool_name})
@@ -2632,8 +2632,8 @@ function(setup_host_tool tool_name setting_name exe_var_name target_var_name)
26322632
# Set up a native tool build if necessary
26332633
if(LLVM_USE_HOST_TOOLS AND NOT ${setting_name})
26342634
build_native_tool(${tool_name} exe_name DEPENDS ${tool_name})
2635-
add_custom_target(${${target_var_name}} DEPENDS ${exe_name})
2635+
add_custom_target(${target_var_name} DEPENDS ${exe_name})
26362636
get_subproject_title(subproject_title)
2637-
set_target_properties(${${target_var_name}} PROPERTIES FOLDER "${subproject_title}/Native")
2637+
set_target_properties(${target_var_name} PROPERTIES FOLDER "${subproject_title}/Native")
26382638
endif()
26392639
endfunction()

mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@ function(add_linalg_ods_yaml_gen yaml_ast_file output_file)
1515
MAIN_DEPENDENCY
1616
${YAML_AST_SOURCE}
1717
DEPENDS
18+
${MLIR_LINALG_ODS_YAML_GEN_EXE}
1819
${MLIR_LINALG_ODS_YAML_GEN_TARGET})
1920
add_custom_target(
2021
MLIR${output_file}YamlIncGen
2122
DEPENDS
23+
${MLIR_LINALG_ODS_YAML_GEN_EXE}
24+
${MLIR_LINALG_ODS_YAML_GEN_TARGET}
2225
${GEN_ODS_FILE} ${GEN_CPP_FILE})
2326
set_target_properties(MLIR${output_file}YamlIncGen PROPERTIES FOLDER "MLIR/Tablegenning")
2427
list(APPEND LLVM_TARGET_DEPENDS ${GEN_ODS_FILE})

0 commit comments

Comments
 (0)