[MLIR] Fix linkage for libMLIR.so

stephenneuendorffer · stephenneuendorffer · commit 37ce8d6ade24 · 2020-05-17T13:46:52.000-07:00
Generally: 1) don't use target_link_libraries() and add_mlir_library() on the same target, use LINK_LIBS PUBLIC instead. 2) don't use LINK_LIBS to specify LLVM libraries. Use LINK_COMPONENTS instead 3) no need to link against LLVMSupport. We pull it in by default. Differential Revision: https://reviews.llvm.org/D80076
diff --git a/mlir/lib/Conversion/LinalgToStandard/CMakeLists.txt b/mlir/lib/Conversion/LinalgToStandard/CMakeLists.txt
@@ -7,13 +7,14 @@ add_mlir_conversion_library(MLIRLinalgToStandard
   DEPENDS
   MLIRConversionPassIncGen
 
+  LINK_COMPONENTS
+  Core
+
   LINK_LIBS PUBLIC
   MLIREDSC
   MLIRIR
   MLIRLinalgOps
   MLIRPass
   MLIRSCF
   MLIRTransforms
-  LLVMCore
-  LLVMSupport
   )
diff --git a/mlir/lib/Dialect/StandardOps/Transforms/CMakeLists.txt b/mlir/lib/Dialect/StandardOps/Transforms/CMakeLists.txt
@@ -12,7 +12,5 @@ add_mlir_dialect_library(MLIRStandardOpsTransforms
   MLIRIR
   MLIRPass
   MLIRStandardOps
-  MLIRSupport
   MLIRTransforms
-  LLVMSupport
   )
diff --git a/mlir/lib/ExecutionEngine/CMakeLists.txt b/mlir/lib/ExecutionEngine/CMakeLists.txt
@@ -55,7 +55,6 @@ add_mlir_library(MLIRJitRunner
   Core
   OrcJIT
   JITLink
-  Support
 
   LINK_LIBS PUBLIC
   MLIRExecutionEngine
diff --git a/mlir/lib/IR/CMakeLists.txt b/mlir/lib/IR/CMakeLists.txt
@@ -36,5 +36,4 @@ add_mlir_library(MLIRIR
 
   LINK_LIBS PUBLIC
   MLIRSupport
-  LLVMSupport
   )
diff --git a/mlir/lib/Support/CMakeLists.txt b/mlir/lib/Support/CMakeLists.txt
@@ -13,9 +13,6 @@ add_mlir_library(MLIRSupport
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Support
 
-  LINK_COMPONENTS
-  Support
-
   LINK_LIBS PUBLIC
   ${LLVM_PTHREAD_LIB})
 
@@ -25,9 +22,6 @@ add_mlir_library(MLIROptLib
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Support
 
-  LINK_COMPONENTS
-  Support
-
   LINK_LIBS PUBLIC
   MLIRPass
   MLIRParser

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,5 @@ add_mlir_dialect_library(MLIRStandardOpsTransforms`
`12`	`12`	`MLIRIR`
`13`	`13`	`MLIRPass`
`14`	`14`	`MLIRStandardOps`
`15`		`- MLIRSupport`
`16`	`15`	`MLIRTransforms`
`17`		`- LLVMSupport`
`18`	`16`	`)`
Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,4 @@ add_mlir_library(MLIRIR`
`36`	`36`
`37`	`37`	`LINK_LIBS PUBLIC`
`38`	`38`	`MLIRSupport`
`39`		`- LLVMSupport`
`40`	`39`	`)`