Fix some problems with the builds.

Author: schweitzpgi

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

@@ -4,9 +4,12 @@
 set(LLVM_TARGET_DEFINITIONS FIROps.td)
 mlir_tablegen(FIROps.h.inc -gen-op-decls)
 mlir_tablegen(FIROps.cpp.inc -gen-op-defs)
+add_public_tablegen_target(FIROpsIncGen)
+
+set(LLVM_TARGET_DEFINITIONS FIRTypes.td)
 mlir_tablegen(FIROpsTypes.h.inc --gen-typedef-decls)
 mlir_tablegen(FIROpsTypes.cpp.inc --gen-typedef-defs)
-add_public_tablegen_target(FIROpsIncGen)
+add_public_tablegen_target(FIRTypesIncGen)
 
 add_custom_target(flang-doc)
 set(dialect_doc_filename "FIRLangRef")

flang/include/flang/Optimizer/Dialect/FIRDialect.td

@@ -14,6 +14,12 @@
 #ifndef FORTRAN_DIALECT_FIR_DIALECT
 #define FORTRAN_DIALECT_FIR_DIALECT
 
+include "mlir/IR/SymbolInterfaces.td"
+include "mlir/Interfaces/CallInterfaces.td"
+include "mlir/Interfaces/ControlFlowInterfaces.td"
+include "mlir/Interfaces/LoopLikeInterface.td"
+include "mlir/Interfaces/SideEffectInterfaces.td"
+
 def fir_Dialect : Dialect {
   let name = "fir";
   let cppNamespace = "::fir";

flang/include/flang/Optimizer/Dialect/FIROps.td

@@ -14,11 +14,7 @@
 #ifndef FORTRAN_DIALECT_FIR_OPS
 #define FORTRAN_DIALECT_FIR_OPS
 
-include "mlir/IR/SymbolInterfaces.td"
-include "mlir/Interfaces/CallInterfaces.td"
-include "mlir/Interfaces/ControlFlowInterfaces.td"
-include "mlir/Interfaces/LoopLikeInterface.td"
-include "mlir/Interfaces/SideEffectInterfaces.td"
+include "flang/Optimizer/Dialect/FIRDialect.td"
 include "flang/Optimizer/Dialect/FIRTypes.td"
 
 // Base class for FIR operations.

flang/lib/Optimizer/Dialect/CMakeLists.txt

@@ -9,6 +9,7 @@ add_flang_library(FIRDialect
   DEPENDS
   FIRSupport
   FIROpsIncGen
+  FIRTypesIncGen
 
   LINK_LIBS
   FIRSupport

flang/lib/Optimizer/Support/CMakeLists.txt

@@ -7,6 +7,7 @@ add_flang_library(FIRSupport
   KindMapping.cpp
 
   DEPENDS
+  FIRTypesIncGen
   ${dialect_libs}
 
   LINK_LIBS