squiid/llvm
1
0
Fork 0
Code Issues Pull requests Activity

[flang] Fix fallout from varous changes to the cmake files.

Browse source 
Differential revision: https://reviews.llvm.org/D82050
This commit is contained in:
Eric Schweitz 2020-06-17 13:09:07 -07:00
parent 07a1749081
commit b46e2548b6
6 changed files with 39 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
flang/lib/Lower/CMakeLists.txt
View file

@ -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

28
flang/lib/Optimizer/CMakeLists.txt
View file

@ -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
)

28
flang/lib/Optimizer/Dialect/CMakeLists.txt
View file

@ -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
)

11
flang/lib/Optimizer/Support/CMakeLists.txt
View file

@ -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}
)

3
flang/tools/tco/CMakeLists.txt
View file

@ -1,8 +1,7 @@
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
set(LIBS
FIRDialect
FIRSupport
FIROptimizer
${dialect_libs}
MLIRIR
MLIRLLVMIR

2
flang/unittests/Optimizer/CMakeLists.txt
View file

@ -1,7 +1,7 @@
get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS)
set(LIBS
FIRDialect
FIROptimizer
${dialect_libs}
)