diff --git a/mlir/lib/Analysis/CMakeLists.txt b/mlir/lib/Analysis/CMakeLists.txt --- a/mlir/lib/Analysis/CMakeLists.txt +++ b/mlir/lib/Analysis/CMakeLists.txt @@ -17,12 +17,7 @@ ADDITIONAL_HEADER_DIRS ${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis - DEPENDS - mlir-generic-headers - ) - -target_link_libraries(MLIRAnalysis - PUBLIC + LINK_LIBS PUBLIC MLIRAffineOps MLIRCallInterfaces MLIRControlFlowInterfaces @@ -40,14 +35,10 @@ ADDITIONAL_HEADER_DIRS ${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis - DEPENDS - mlir-generic-headers - ) - -target_link_libraries(MLIRLoopAnalysis - PUBLIC + LINK_LIBS PUBLIC MLIRAffineOps MLIRCallInterfaces MLIRControlFlowInterfaces MLIRInferTypeOpInterface - MLIRLoopOps) + MLIRLoopOps + ) diff --git a/mlir/lib/Dialect/AVX512/CMakeLists.txt b/mlir/lib/Dialect/AVX512/CMakeLists.txt --- a/mlir/lib/Dialect/AVX512/CMakeLists.txt +++ b/mlir/lib/Dialect/AVX512/CMakeLists.txt @@ -6,9 +6,8 @@ DEPENDS MLIRAVX512IncGen - ) -target_link_libraries(MLIRAVX512 - PUBLIC + + LINK_LIBS PUBLIC MLIRIR MLIRSideEffects MLIRVectorToLLVM diff --git a/mlir/lib/Dialect/Affine/EDSC/CMakeLists.txt b/mlir/lib/Dialect/Affine/EDSC/CMakeLists.txt --- a/mlir/lib/Dialect/Affine/EDSC/CMakeLists.txt +++ b/mlir/lib/Dialect/Affine/EDSC/CMakeLists.txt @@ -6,9 +6,8 @@ DEPENDS MLIRAffineOpsIncGen - ) -target_link_libraries(MLIRAffineEDSC - PUBLIC + + LINK_LIBS PUBLIC MLIRAffineOps MLIREDSC MLIRIR diff --git a/mlir/lib/Dialect/Affine/IR/CMakeLists.txt b/mlir/lib/Dialect/Affine/IR/CMakeLists.txt --- a/mlir/lib/Dialect/Affine/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Affine/IR/CMakeLists.txt @@ -7,9 +7,8 @@ DEPENDS MLIRAffineOpsIncGen - ) -target_link_libraries(MLIRAffineOps - PUBLIC + + LINK_LIBS PUBLIC MLIREDSC MLIRIR MLIRLoopLikeInterface diff --git a/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt --- a/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt @@ -14,9 +14,8 @@ MLIRAffineOpsIncGen MLIRAffinePassIncGen MLIRLoopLikeInterfaceIncGen - ) -target_link_libraries(MLIRAffineTransforms - PUBLIC + + LINK_LIBS PUBLIC MLIRAffineOps MLIREDSC MLIRIR diff --git a/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt b/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt --- a/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt +++ b/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt @@ -4,9 +4,7 @@ ADDITIONAL_HEADER_DIRS ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Affine - ) -target_link_libraries(MLIRAffineUtils - PUBLIC + LINK_LIBS PUBLIC MLIRAffineOps MLIRTransformUtils ) diff --git a/mlir/lib/Dialect/GPU/CMakeLists.txt b/mlir/lib/Dialect/GPU/CMakeLists.txt --- a/mlir/lib/Dialect/GPU/CMakeLists.txt +++ b/mlir/lib/Dialect/GPU/CMakeLists.txt @@ -13,9 +13,8 @@ MLIRGPUPassIncGen MLIRParallelLoopMapperAttrGen MLIRParallelLoopMapperEnumsGen - ) -target_link_libraries(MLIRGPU - PUBLIC + + LINK_LIBS PUBLIC MLIREDSC MLIRIR MLIRLLVMIR diff --git a/mlir/lib/Dialect/LLVMIR/CMakeLists.txt b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt --- a/mlir/lib/Dialect/LLVMIR/CMakeLists.txt +++ b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt @@ -16,9 +16,8 @@ BitWriter Core FrontendOpenMP -) -target_link_libraries(MLIRLLVMIR - PUBLIC + + LINK_LIBS PUBLIC MLIRCallInterfaces MLIRControlFlowInterfaces MLIROpenMP @@ -40,9 +39,8 @@ LINK_COMPONENTS AsmParser Core - ) -target_link_libraries(MLIRLLVMAVX512 - PUBLIC + + LINK_LIBS PUBLIC MLIRIR MLIRLLVMIR MLIRSideEffects @@ -61,9 +59,8 @@ LINK_COMPONENTS AsmParser Core - ) -target_link_libraries(MLIRNVVMIR - PUBLIC + + LINK_LIBS PUBLIC MLIRIR MLIRLLVMIR MLIRSideEffects @@ -82,9 +79,8 @@ LINK_COMPONENTS AsmParser Core - ) -target_link_libraries(MLIRROCDLIR - PUBLIC + + LINK_LIBS PUBLIC MLIRIR MLIRSideEffects MLIRVectorToLLVM diff --git a/mlir/lib/Dialect/LLVMIR/Transforms/CMakeLists.txt b/mlir/lib/Dialect/LLVMIR/Transforms/CMakeLists.txt --- a/mlir/lib/Dialect/LLVMIR/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/LLVMIR/Transforms/CMakeLists.txt @@ -3,10 +3,8 @@ DEPENDS MLIRLLVMPassIncGen - ) -target_link_libraries(MLIRLLVMIRTransforms - PUBLIC + LINK_LIBS PUBLIC MLIRIR MLIRLLVMIR MLIRPass diff --git a/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt --- a/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/Analysis/CMakeLists.txt @@ -6,10 +6,8 @@ DEPENDS intrinsics_gen - ) -target_link_libraries(MLIRLinalgAnalysis - PUBLIC + LINK_LIBS PUBLIC MLIRIR MLIRLinalgOps MLIRStandardOps diff --git a/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt b/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt --- a/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/EDSC/CMakeLists.txt @@ -6,10 +6,8 @@ DEPENDS intrinsics_gen - ) -target_link_libraries(MLIRLinalgEDSC - PUBLIC + LINK_LIBS PUBLIC MLIREDSC MLIRIR MLIRAffineOps diff --git a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt --- a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt @@ -12,9 +12,8 @@ intrinsics_gen MLIRLinalgPassIncGen MLIRLinalgTransformPatternsIncGen - ) -target_link_libraries(MLIRLinalgTransforms - PUBLIC + + LINK_LIBS PUBLIC MLIRAffineOps MLIRAnalysis MLIREDSC diff --git a/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt --- a/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt @@ -3,12 +3,11 @@ ADDITIONAL_HEADER_DIRS ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg + DEPENDS intrinsics_gen - ) -target_link_libraries(MLIRLinalgUtils - PUBLIC + LINK_LIBS PUBLIC MLIRAffineOps MLIREDSC MLIRIR diff --git a/mlir/lib/Dialect/LoopOps/CMakeLists.txt b/mlir/lib/Dialect/LoopOps/CMakeLists.txt --- a/mlir/lib/Dialect/LoopOps/CMakeLists.txt +++ b/mlir/lib/Dialect/LoopOps/CMakeLists.txt @@ -8,9 +8,8 @@ DEPENDS MLIRLoopOpsIncGen - ) -target_link_libraries(MLIRLoopOps - PUBLIC + + LINK_LIBS PUBLIC MLIREDSC MLIRIR MLIRLoopLikeInterface diff --git a/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt b/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt --- a/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt @@ -8,9 +8,8 @@ DEPENDS MLIRLoopPassIncGen - ) -target_link_libraries(MLIRLoopOpsTransforms - PUBLIC + + LINK_LIBS PUBLIC MLIRAffineOps MLIRIR MLIRPass diff --git a/mlir/lib/Dialect/OpenMP/CMakeLists.txt b/mlir/lib/Dialect/OpenMP/CMakeLists.txt --- a/mlir/lib/Dialect/OpenMP/CMakeLists.txt +++ b/mlir/lib/Dialect/OpenMP/CMakeLists.txt @@ -6,8 +6,7 @@ DEPENDS MLIROpenMPOpsIncGen - ) -target_link_libraries(MLIROpenMP - PUBLIC + + LINK_LIBS PUBLIC MLIRIR ) diff --git a/mlir/lib/Dialect/Quant/CMakeLists.txt b/mlir/lib/Dialect/Quant/CMakeLists.txt --- a/mlir/lib/Dialect/Quant/CMakeLists.txt +++ b/mlir/lib/Dialect/Quant/CMakeLists.txt @@ -15,9 +15,8 @@ DEPENDS MLIRQuantOpsIncGen MLIRQuantPassIncGen - ) -target_link_libraries(MLIRQuant - PUBLIC + + LINK_LIBS PUBLIC MLIRIR MLIRPass MLIRSideEffects diff --git a/mlir/lib/Dialect/SDBM/CMakeLists.txt b/mlir/lib/Dialect/SDBM/CMakeLists.txt --- a/mlir/lib/Dialect/SDBM/CMakeLists.txt +++ b/mlir/lib/Dialect/SDBM/CMakeLists.txt @@ -5,8 +5,7 @@ ADDITIONAL_HEADER_DIRS ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SDBM -) -target_link_libraries(MLIRSDBM - PUBLIC + + LINK_LIBS PUBLIC MLIRIR ) diff --git a/mlir/lib/Dialect/SPIRV/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/CMakeLists.txt --- a/mlir/lib/Dialect/SPIRV/CMakeLists.txt +++ b/mlir/lib/Dialect/SPIRV/CMakeLists.txt @@ -27,9 +27,8 @@ MLIRSPIRVOpsIncGen MLIRSPIRVOpUtilsGen MLIRSPIRVTargetAndABIIncGen - ) -target_link_libraries(MLIRSPIRV - PUBLIC + + LINK_LIBS PUBLIC MLIRControlFlowInterfaces MLIRIR MLIRParser diff --git a/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt --- a/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt +++ b/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt @@ -9,9 +9,8 @@ DEPENDS MLIRSPIRVSerializationGen - ) -target_link_libraries(MLIRSPIRVSerialization - PUBLIC + + LINK_LIBS PUBLIC MLIRIR MLIRSPIRV MLIRSupport diff --git a/mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt --- a/mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt @@ -8,10 +8,8 @@ DEPENDS MLIRSPIRVPassIncGen - ) -target_link_libraries(MLIRSPIRVTransforms - PUBLIC + LINK_LIBS PUBLIC MLIRPass MLIRSPIRV ) diff --git a/mlir/lib/Dialect/Shape/CMakeLists.txt b/mlir/lib/Dialect/Shape/CMakeLists.txt --- a/mlir/lib/Dialect/Shape/CMakeLists.txt +++ b/mlir/lib/Dialect/Shape/CMakeLists.txt @@ -6,9 +6,8 @@ DEPENDS MLIRShapeOpsIncGen - ) -target_link_libraries(MLIRShape - PUBLIC + + LINK_LIBS PUBLIC MLIRDialect MLIRInferTypeOpInterface MLIRIR diff --git a/mlir/lib/Dialect/StandardOps/CMakeLists.txt b/mlir/lib/Dialect/StandardOps/CMakeLists.txt --- a/mlir/lib/Dialect/StandardOps/CMakeLists.txt +++ b/mlir/lib/Dialect/StandardOps/CMakeLists.txt @@ -8,9 +8,8 @@ DEPENDS MLIRStandardOpsIncGen - ) -target_link_libraries(MLIRStandardOps - PUBLIC + + LINK_LIBS PUBLIC MLIRCallInterfaces MLIRControlFlowInterfaces MLIREDSC diff --git a/mlir/lib/Dialect/Vector/CMakeLists.txt b/mlir/lib/Dialect/Vector/CMakeLists.txt --- a/mlir/lib/Dialect/Vector/CMakeLists.txt +++ b/mlir/lib/Dialect/Vector/CMakeLists.txt @@ -10,9 +10,8 @@ DEPENDS MLIRVectorOpsIncGen MLIRVectorTransformPatternsIncGen - ) -target_link_libraries(MLIRVector - PUBLIC + + LINK_LIBS PUBLIC MLIREDSC MLIRIR MLIRStandardOps diff --git a/mlir/lib/EDSC/CMakeLists.txt b/mlir/lib/EDSC/CMakeLists.txt --- a/mlir/lib/EDSC/CMakeLists.txt +++ b/mlir/lib/EDSC/CMakeLists.txt @@ -8,10 +8,8 @@ ADDITIONAL_HEADER_DIRS ${MLIR_MAIN_INCLUDE_DIR}/mlir/EDSC - ) -target_link_libraries(MLIREDSC - PUBLIC + LINK_LIBS PUBLIC MLIRIR MLIRSupport ) @@ -21,9 +19,8 @@ ADDITIONAL_HEADER_DIRS ${MLIR_MAIN_INCLUDE_DIR}/mlir/EDSC - ) -target_link_libraries(MLIREDSCInterface - PUBLIC + + LINK_LIBS PUBLIC MLIRIR MLIRSupport MLIRParser diff --git a/mlir/lib/IR/CMakeLists.txt b/mlir/lib/IR/CMakeLists.txt --- a/mlir/lib/IR/CMakeLists.txt +++ b/mlir/lib/IR/CMakeLists.txt @@ -9,9 +9,8 @@ MLIRCallInterfacesIncGen MLIROpAsmInterfacesIncGen MLIRSymbolInterfacesIncGen - ) -target_link_libraries(MLIRIR - PUBLIC + + LINK_LIBS PUBLIC MLIRSupport LLVMSupport ) diff --git a/mlir/lib/Interfaces/CMakeLists.txt b/mlir/lib/Interfaces/CMakeLists.txt --- a/mlir/lib/Interfaces/CMakeLists.txt +++ b/mlir/lib/Interfaces/CMakeLists.txt @@ -16,9 +16,8 @@ DEPENDS MLIRCallInterfacesIncGen - ) -target_link_libraries(MLIRCallInterfaces - PUBLIC + + LINK_LIBS PUBLIC MLIRIR ) @@ -30,9 +29,8 @@ DEPENDS MLIRControlFlowInterfacesIncGen - ) -target_link_libraries(MLIRControlFlowInterfaces - PUBLIC + + LINK_LIBS PUBLIC MLIRIR ) @@ -44,9 +42,8 @@ DEPENDS MLIRDerivedAttributeOpInterfaceIncGen - ) -target_link_libraries(MLIRDerivedAttributeOpInterface - PUBLIC + + LINK_LIBS PUBLIC MLIRIR ) @@ -58,9 +55,8 @@ DEPENDS MLIRInferTypeOpInterfaceIncGen - ) -target_link_libraries(MLIRInferTypeOpInterface - PUBLIC + + LINK_LIBS PUBLIC MLIRIR ) @@ -72,9 +68,8 @@ DEPENDS MLIRLoopLikeInterfaceIncGen - ) -target_link_libraries(MLIRLoopLikeInterface - PUBLIC + + LINK_LIBS PUBLIC MLIRIR ) @@ -86,9 +81,8 @@ DEPENDS MLIRSideEffectOpInterfacesIncGen - ) -target_link_libraries(MLIRSideEffects - PUBLIC + + LINK_LIBS PUBLIC MLIRIR ) @@ -100,8 +94,7 @@ DEPENDS MLIRViewLikeInterfaceIncGen - ) -target_link_libraries(MLIRViewLikeInterface - PUBLIC + + LINK_LIBS PUBLIC MLIRIR ) diff --git a/mlir/lib/Parser/CMakeLists.txt b/mlir/lib/Parser/CMakeLists.txt --- a/mlir/lib/Parser/CMakeLists.txt +++ b/mlir/lib/Parser/CMakeLists.txt @@ -6,10 +6,6 @@ ADDITIONAL_HEADER_DIRS ${MLIR_MAIN_INCLUDE_DIR}/mlir/Parser - DEPENDS - mlir-generic-headers - ) -target_link_libraries(MLIRParser - PUBLIC + LINK_LIBS PUBLIC MLIRIR ) diff --git a/mlir/lib/Pass/CMakeLists.txt b/mlir/lib/Pass/CMakeLists.txt --- a/mlir/lib/Pass/CMakeLists.txt +++ b/mlir/lib/Pass/CMakeLists.txt @@ -4,9 +4,11 @@ ADDITIONAL_HEADER_DIRS ${MLIR_MAIN_INCLUDE_DIR}/mlir/Pass - ) -target_link_libraries(MLIRPass - PUBLIC + + DEPENDS + mlir-generic-headers + + LINK_LIBS PUBLIC MLIRAnalysis MLIRIR ) diff --git a/mlir/lib/Support/CMakeLists.txt b/mlir/lib/Support/CMakeLists.txt --- a/mlir/lib/Support/CMakeLists.txt +++ b/mlir/lib/Support/CMakeLists.txt @@ -16,9 +16,8 @@ LINK_COMPONENTS Support - ) -target_link_libraries(MLIRSupport - PUBLIC + + LINK_LIBS PUBLIC ${LLVM_PTHREAD_LIB}) add_mlir_library(MLIROptLib @@ -29,9 +28,8 @@ LINK_COMPONENTS Support - ) -target_link_libraries(MLIROptLib - PUBLIC + + LINK_LIBS PUBLIC MLIRPass MLIRParser MLIRSupport @@ -49,9 +47,8 @@ OrcJIT JITLink Support - ) -target_link_libraries(MLIRJitRunner - PUBLIC + + LINK_LIBS PUBLIC MLIRExecutionEngine MLIRIR MLIRParser diff --git a/mlir/lib/Target/CMakeLists.txt b/mlir/lib/Target/CMakeLists.txt --- a/mlir/lib/Target/CMakeLists.txt +++ b/mlir/lib/Target/CMakeLists.txt @@ -12,9 +12,8 @@ Core FrontendOpenMP TransformUtils - ) -target_link_libraries(MLIRTargetLLVMIRModuleTranslation - PUBLIC + + LINK_LIBS PUBLIC MLIRLLVMIR MLIRLLVMIRTransforms MLIRTranslation @@ -31,9 +30,8 @@ LINK_COMPONENTS Core - ) -target_link_libraries(MLIRTargetAVX512 - PUBLIC + + LINK_LIBS PUBLIC MLIRIR MLIRLLVMAVX512 MLIRLLVMIR @@ -50,9 +48,8 @@ LINK_COMPONENTS Core IRReader - ) -target_link_libraries(MLIRTargetLLVMIR - PUBLIC + + LINK_LIBS PUBLIC MLIRTargetLLVMIRModuleTranslation ) @@ -67,9 +64,8 @@ LINK_COMPONENTS Core - ) -target_link_libraries(MLIRTargetNVVMIR - PUBLIC + + LINK_LIBS PUBLIC MLIRGPU MLIRIR MLIRLLVMIR @@ -88,9 +84,8 @@ LINK_COMPONENTS Core - ) -target_link_libraries(MLIRTargetROCDLIR - PUBLIC + + LINK_LIBS PUBLIC MLIRGPU MLIRIR MLIRLLVMIR diff --git a/mlir/lib/Transforms/CMakeLists.txt b/mlir/lib/Transforms/CMakeLists.txt --- a/mlir/lib/Transforms/CMakeLists.txt +++ b/mlir/lib/Transforms/CMakeLists.txt @@ -26,10 +26,8 @@ DEPENDS MLIRStandardOpsIncGen MLIRTransformsPassIncGen - ) -target_link_libraries(MLIRTransforms - PUBLIC + LINK_LIBS PUBLIC MLIRAffineOps MLIRAnalysis MLIRLoopLikeInterface diff --git a/mlir/lib/Transforms/Utils/CMakeLists.txt b/mlir/lib/Transforms/Utils/CMakeLists.txt --- a/mlir/lib/Transforms/Utils/CMakeLists.txt +++ b/mlir/lib/Transforms/Utils/CMakeLists.txt @@ -12,10 +12,8 @@ DEPENDS MLIRStandardOpsIncGen - ) -target_link_libraries(MLIRTransformUtils - PUBLIC + LINK_LIBS PUBLIC MLIRAffineOps MLIRAnalysis MLIRLoopAnalysis diff --git a/mlir/lib/Translation/CMakeLists.txt b/mlir/lib/Translation/CMakeLists.txt --- a/mlir/lib/Translation/CMakeLists.txt +++ b/mlir/lib/Translation/CMakeLists.txt @@ -3,9 +3,8 @@ ADDITIONAL_HEADER_DIRS ${MLIR_MAIN_INCLUDE_DIR}/mlir/Translation - ) -target_link_libraries(MLIRTranslation - PUBLIC + + LINK_LIBS PUBLIC MLIRIR MLIRParser ) diff --git a/mlir/test/lib/Dialect/Affine/CMakeLists.txt b/mlir/test/lib/Dialect/Affine/CMakeLists.txt --- a/mlir/test/lib/Dialect/Affine/CMakeLists.txt +++ b/mlir/test/lib/Dialect/Affine/CMakeLists.txt @@ -14,9 +14,8 @@ LINK_COMPONENTS Core - ) -target_link_libraries(MLIRAffineTransformsTestPasses PRIVATE + LINK_LIBS PUBLIC MLIRIR MLIRPass MLIRAffineTransforms diff --git a/mlir/test/lib/Dialect/SPIRV/CMakeLists.txt b/mlir/test/lib/Dialect/SPIRV/CMakeLists.txt --- a/mlir/test/lib/Dialect/SPIRV/CMakeLists.txt +++ b/mlir/test/lib/Dialect/SPIRV/CMakeLists.txt @@ -7,9 +7,8 @@ ADDITIONAL_HEADER_DIRS ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV ${MLIR_MAIN_INCLUDE_DIR}/mlir/IR - ) -target_link_libraries(MLIRSPIRVTestPasses PRIVATE + LINK_LIBS PUBLIC MLIRIR MLIRPass MLIRSPIRV diff --git a/mlir/test/lib/Dialect/Test/CMakeLists.txt b/mlir/test/lib/Dialect/Test/CMakeLists.txt --- a/mlir/test/lib/Dialect/Test/CMakeLists.txt +++ b/mlir/test/lib/Dialect/Test/CMakeLists.txt @@ -23,9 +23,8 @@ DEPENDS MLIRTestOpsIncGen -) -target_link_libraries(MLIRTestDialect - PUBLIC + + LINK_LIBS PUBLIC MLIRControlFlowInterfaces MLIRDerivedAttributeOpInterface MLIRDialect diff --git a/mlir/test/lib/IR/CMakeLists.txt b/mlir/test/lib/IR/CMakeLists.txt --- a/mlir/test/lib/IR/CMakeLists.txt +++ b/mlir/test/lib/IR/CMakeLists.txt @@ -6,12 +6,11 @@ TestSymbolUses.cpp EXCLUDE_FROM_LIBMLIR - ) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test) -include_directories(${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test) -target_link_libraries(MLIRTestIR - PUBLIC + LINK_LIBS PUBLIC MLIRPass MLIRTestDialect ) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test) +include_directories(${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test) + diff --git a/mlir/test/lib/Pass/CMakeLists.txt b/mlir/test/lib/Pass/CMakeLists.txt --- a/mlir/test/lib/Pass/CMakeLists.txt +++ b/mlir/test/lib/Pass/CMakeLists.txt @@ -6,9 +6,8 @@ ADDITIONAL_HEADER_DIRS ${MLIR_MAIN_INCLUDE_DIR}/mlir/Pass - ) -target_link_libraries(MLIRTestPass - PUBLIC + + LINK_LIBS PUBLIC MLIRIR MLIRPass ) diff --git a/mlir/test/lib/Transforms/CMakeLists.txt b/mlir/test/lib/Transforms/CMakeLists.txt --- a/mlir/test/lib/Transforms/CMakeLists.txt +++ b/mlir/test/lib/Transforms/CMakeLists.txt @@ -30,15 +30,8 @@ MLIRStandardOpsIncGen MLIRTestLinalgTransformPatternsIncGen MLIRTestVectorTransformPatternsIncGen - ) - -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test) -include_directories(${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../DeclarativeTransforms) -include_directories(${CMAKE_CURRENT_BINARY_DIR}/../DeclarativeTransforms) -target_link_libraries(MLIRTestTransforms - PUBLIC + LINK_LIBS PUBLIC MLIRAffineOps MLIRAnalysis MLIREDSC @@ -55,3 +48,8 @@ MLIRVectorToLoops MLIRVector ) + +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../Dialect/Test) +include_directories(${CMAKE_CURRENT_BINARY_DIR}/../Dialect/Test) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../DeclarativeTransforms) +include_directories(${CMAKE_CURRENT_BINARY_DIR}/../DeclarativeTransforms) diff --git a/mlir/tools/mlir-opt/CMakeLists.txt b/mlir/tools/mlir-opt/CMakeLists.txt --- a/mlir/tools/mlir-opt/CMakeLists.txt +++ b/mlir/tools/mlir-opt/CMakeLists.txt @@ -39,17 +39,18 @@ mlir-opt.cpp EXCLUDE_FROM_LIBMLIR - ) -target_link_libraries(MLIRMlirOptMain - PUBLIC + + LINK_LIBS ${LIBS} -) + ) add_llvm_tool(mlir-opt - mlir-opt.cpp -) - + mlir-opt.cpp + + DEPENDS + ${LIBS} + ) +target_link_libraries(mlir-opt PRIVATE ${LIBS}) llvm_update_compile_flags(mlir-opt) -target_link_libraries(mlir-opt PRIVATE ${LIBS} ${targets_to_link}) mlir_check_link_libraries(mlir-opt)