[flang] Fixes build problems stemming from changes to cmake files

[schweitz]

Summary

Recent target, etc. changes to the cmake files broke the flang builds.

[schweitz]

Resolve new conflicts.

[PeteSteinfeld]

Everything builds and tests correctly for me.

flang/lib/Lower/CMakeLists.txt

 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error -Wno-unused-parameter")
+get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
 
 add_flang_library(FortranLower
   ComplexExpr.cpp
   ConvertType.cpp
   DoLoopHelper.cpp
   Mangler.cpp
   OpenMP.cpp
   PFTBuilder.cpp
 
   DEPENDS
-  FIROpsIncGen
-  MLIRControlFlowInterfaces
-  MLIRLinalgOps
+  FIROptimizer
+  ${dialect_libs}
+
+  LINK_LIBS
+  FIROptimizer
+  ${dialect_libs}
+  MLIRAffineToStandard
+  MLIRLLVMIR
+  MLIRSCFToStandard
+  MLIRStandardOps
 
   LINK_COMPONENTS
   Support
 )

flang/lib/Optimizer/CMakeLists.txt

-add_subdirectory(Dialect)
-add_subdirectory(Support)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter -Wno-error")
+get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
+
+add_flang_library(FIROptimizer
+  Dialect/FIRAttr.cpp
+  Dialect/FIRDialect.cpp
+  Dialect/FIROps.cpp
+  Dialect/FIRType.cpp
+
+  Support/InternalNames.cpp
+  Support/KindMapping.cpp
+
+  DEPENDS
+  FIROpsIncGen
+  ${dialect_libs}
+
+  LINK_LIBS
+  ${dialect_libs}
+  MLIRTargetLLVMIR
+  MLIRTargetLLVMIRModuleTranslation
+
+  LINK_COMPONENTS
+  AsmParser
+  AsmPrinter
+  Remarks
+)

flang/lib/Optimizer/Dialect/CMakeLists.txt

-get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
-
-add_flang_library(FIRDialect
-  FIRAttr.cpp
-  FIRDialect.cpp
-  FIROps.cpp
-  FIRType.cpp
-
-  DEPENDS
-  FIROpsIncGen
-  ${dialect_libs}
-
-  LINK_LIBS
-  FIRSupport
-  MLIRTargetLLVMIR
-  MLIRTargetLLVMIRModuleTranslation
-  MLIREDSC
-  MLIRExecutionEngine
-  MLIRParser
-  MLIRSupport
-  MLIRStandardToLLVM
-  MLIRTransforms
-
-  LINK_COMPONENTS
-  AsmParser
-  AsmPrinter
-  Remarks
-)

flang/lib/Optimizer/Support/CMakeLists.txt

-get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
-
-add_flang_library(FIRSupport
-  InternalNames.cpp
-  KindMapping.cpp
-
-  DEPENDS
-  ${dialect_libs}
-  LINK_LIBS
-  ${dialect_libs}
-)

flang/tools/tco/CMakeLists.txt

 get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
 
 set(LIBS
-  FIRDialect
-  FIRSupport
+  FIROptimizer
   ${dialect_libs}
   MLIRIR
   MLIRLLVMIR
   MLIRPass
   MLIRStandardToLLVM
   MLIRTransforms
   MLIRAffineToStandard
   MLIRAnalysis

flang/unittests/Optimizer/CMakeLists.txt

 get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
 
 set(LIBS
-  FIRDialect
+  FIROptimizer
   ${dialect_libs}
 )
 
 add_flang_unittest(FlangOptimizerTests
   InternalNamesTest.cpp
 )
 target_link_libraries(FlangOptimizerTests
   PRIVATE
   ${LIBS})