[Flang] fix dependency issues after D78215

clementval · kiranchandramohan · commit a6c1692cb30e · 2020-04-21T20:32:11.000+01:00
Patch D78215 changes various dependencies in the CMakeLists.txt. This results in error while compiling. This patch fixes the issue. Reviewers: DavidTruby Differential Revision: https://reviews.llvm.org/D78340
diff --git a/flang/lib/Evaluate/CMakeLists.txt b/flang/lib/Evaluate/CMakeLists.txt
@@ -29,6 +29,7 @@ add_flang_library(FortranEvaluate
   LINK_LIBS
   FortranCommon
   FortranDecimal
+  FortranSemantics
   FortranParser
 )
 
diff --git a/flang/lib/Optimizer/Dialect/CMakeLists.txt b/flang/lib/Optimizer/Dialect/CMakeLists.txt
@@ -1,3 +1,5 @@
+get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
+
 add_flang_library(FIRDialect
   FIRAttr.cpp
   FIRDialect.cpp
@@ -6,6 +8,7 @@ add_flang_library(FIRDialect
 
   DEPENDS
   FIROpsIncGen
+  ${dialect_libs}
 
   LINK_LIBS
   FIRSupport
diff --git a/flang/lib/Optimizer/Support/CMakeLists.txt b/flang/lib/Optimizer/Support/CMakeLists.txt
@@ -3,6 +3,8 @@ get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
 add_flang_library(FIRSupport
   KindMapping.cpp
 
+  DEPENDS
+  ${dialect_libs}
   LINK_LIBS
   ${dialect_libs}
 )

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ add_flang_library(FortranEvaluate`
`29`	`29`	`LINK_LIBS`
`30`	`30`	`FortranCommon`
`31`	`31`	`FortranDecimal`
	`32`	`+ FortranSemantics`
`32`	`33`	`FortranParser`
`33`	`34`	`)`
`34`	`35`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@ get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)`
`3`	`3`	`add_flang_library(FIRSupport`
`4`	`4`	`KindMapping.cpp`
`5`	`5`
	`6`	`+ DEPENDS`
	`7`	`+ ${dialect_libs}`
`6`	`8`	`LINK_LIBS`
`7`	`9`	`${dialect_libs}`
`8`	`10`	`)`