[flang] Fix missing generated includes in out of tree build
authorDavid Spickett <david.spickett@linaro.org>
Wed, 19 Oct 2022 12:22:24 +0000 (12:22 +0000)
committerDavid Spickett <david.spickett@linaro.org>
Wed, 19 Oct 2022 13:20:25 +0000 (13:20 +0000)
875fd9df76ded4a88a3a44b690f290ea98f91705 added a new dialect
with some generated files.

When flang is built out of tree (build llvm/clang/mlir first, then
build flang pointing at the first build) those files were not created
at all.

I don't 100% understand why not but juding by the comment at the top
of the file, add_mlir_interface probably expects to run in an MLIR
directory, as add_mlir_dialect does.

So in the same way, I've just inlined enough of that function to
fix the out of tree build.

Reviewed By: jeanPerier

Differential Revision: https://reviews.llvm.org/D136250

flang/include/flang/Optimizer/Dialect/CMakeLists.txt

index 00d06cd..8f3d47c 100644 (file)
@@ -12,9 +12,12 @@ mlir_tablegen(FIROps.h.inc -gen-op-decls)
 mlir_tablegen(FIROps.cpp.inc -gen-op-defs)
 mlir_tablegen(FIROpsTypes.h.inc --gen-typedef-decls)
 mlir_tablegen(FIROpsTypes.cpp.inc --gen-typedef-defs)
-add_mlir_interface(FortranVariableInterface)
 add_public_tablegen_target(FIROpsIncGen)
 
+set(LLVM_TARGET_DEFINITIONS FortranVariableInterface.td)
+mlir_tablegen(FortranVariableInterface.h.inc -gen-op-interface-decls)
+mlir_tablegen(FortranVariableInterface.cpp.inc -gen-op-interface-defs)
+
 set(LLVM_TARGET_DEFINITIONS CanonicalizationPatterns.td)
 mlir_tablegen(CanonicalizationPatterns.inc -gen-rewriters)
 add_public_tablegen_target(CanonicalizationPatternsIncGen)