From b46e2548b67de40acf33b5dde95077698995576f Mon Sep 17 00:00:00 2001
From: Eric Schweitz <eschweitz@nvidia.com>
Date: Wed, 17 Jun 2020 13:09:07 -0700
Subject: [PATCH] [flang] Fix fallout from varous changes to the cmake files.

Differential revision: https://reviews.llvm.org/D82050
---
 flang/lib/Lower/CMakeLists.txt             | 14 +++++++++++---
 flang/lib/Optimizer/CMakeLists.txt         | 28 ++++++++++++++++++++++++++--
 flang/lib/Optimizer/Dialect/CMakeLists.txt | 28 ----------------------------
 flang/lib/Optimizer/Support/CMakeLists.txt | 11 -----------
 flang/tools/tco/CMakeLists.txt             |  3 +--
 flang/unittests/Optimizer/CMakeLists.txt   |  2 +-
 6 files changed, 39 insertions(+), 47 deletions(-)
 delete mode 100644 flang/lib/Optimizer/Dialect/CMakeLists.txt
 delete mode 100644 flang/lib/Optimizer/Support/CMakeLists.txt

diff --git a/flang/lib/Lower/CMakeLists.txt b/flang/lib/Lower/CMakeLists.txt
index 8265025..8602c23 100644
--- a/flang/lib/Lower/CMakeLists.txt
+++ b/flang/lib/Lower/CMakeLists.txt
@@ -1,4 +1,5 @@
 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
@@ -9,9 +10,16 @@ add_flang_library(FortranLower
   PFTBuilder.cpp
 
   DEPENDS
-  FIROpsIncGen
-  MLIRControlFlowInterfaces
-  MLIRLinalgOps
+  FIROptimizer
+  ${dialect_libs}
+
+  LINK_LIBS
+  FIROptimizer
+  ${dialect_libs}
+  MLIRAffineToStandard
+  MLIRLLVMIR
+  MLIRSCFToStandard
+  MLIRStandardOps
 
   LINK_COMPONENTS
   Support
diff --git a/flang/lib/Optimizer/CMakeLists.txt b/flang/lib/Optimizer/CMakeLists.txt
index 5825015..abeec93 100644
--- a/flang/lib/Optimizer/CMakeLists.txt
+++ b/flang/lib/Optimizer/CMakeLists.txt
@@ -1,2 +1,26 @@
-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
+)
diff --git a/flang/lib/Optimizer/Dialect/CMakeLists.txt b/flang/lib/Optimizer/Dialect/CMakeLists.txt
deleted file mode 100644
index ef7f625..0000000
--- a/flang/lib/Optimizer/Dialect/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-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
-)
diff --git a/flang/lib/Optimizer/Support/CMakeLists.txt b/flang/lib/Optimizer/Support/CMakeLists.txt
deleted file mode 100644
index 25cffb7..0000000
--- a/flang/lib/Optimizer/Support/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
-
-add_flang_library(FIRSupport
-  InternalNames.cpp
-  KindMapping.cpp
-
-  DEPENDS
-  ${dialect_libs}
-  LINK_LIBS
-  ${dialect_libs}
-)
diff --git a/flang/tools/tco/CMakeLists.txt b/flang/tools/tco/CMakeLists.txt
index f893af2..176ce8f 100644
--- a/flang/tools/tco/CMakeLists.txt
+++ b/flang/tools/tco/CMakeLists.txt
@@ -1,8 +1,7 @@
 get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
 
 set(LIBS
-  FIRDialect
-  FIRSupport
+  FIROptimizer
   ${dialect_libs}
   MLIRIR
   MLIRLLVMIR
diff --git a/flang/unittests/Optimizer/CMakeLists.txt b/flang/unittests/Optimizer/CMakeLists.txt
index 64f6e53..9e88a90 100644
--- a/flang/unittests/Optimizer/CMakeLists.txt
+++ b/flang/unittests/Optimizer/CMakeLists.txt
@@ -1,7 +1,7 @@
 get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
 
 set(LIBS
-  FIRDialect
+  FIROptimizer
   ${dialect_libs}
 )
 
-- 
2.7.4