Commit 798e6615 authored by Stephen Neuendorffer's avatar Stephen Neuendorffer
Browse files

Revert "[MLIR] Move from using target_link_libraries to LINK_LIBS for llvm libraries." 

This reverts commit 7a6c6897.
This breaks the build with cmake 3.13.4, but succeeds with cmake 3.15.3
parent 0810acc7

mlir/examples/toy/Ch6/CMakeLists.txt

+0 −5
Original line number Diff line number Diff line
@@ -41,9 +41,4 @@ target_link_libraries(toyc-ch6 
    MLIRPass

    MLIRTargetLLVMIR

    MLIRTransforms

    LLVMOrcJIT

    LLVMSupport

    LLVMX86CodeGen

    LLVMX86Desc

    LLVMX86Info

    )

mlir/examples/toy/Ch7/CMakeLists.txt

+0 −6
Original line number Diff line number Diff line
@@ -38,12 +38,6 @@ target_link_libraries(toyc-ch7 
    MLIRIR

    MLIRParser

    MLIRPass

    MLIRSupport

    MLIRTargetLLVMIR

    MLIRTransforms

    LLVMOrcJIT

    LLVMSupport

    LLVMX86CodeGen

    LLVMX86Desc

    LLVMX86Info

    )

mlir/lib/Analysis/CMakeLists.txt

+4 −15
Original line number Diff line number Diff line
@@ -22,13 +22,6 @@ add_llvm_library(MLIRAnalysis 


  ADDITIONAL_HEADER_DIRS

  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis



  LINK_LIBS

  MLIRAffineOps

  MLIRIR

  MLIRLoopOps

  MLIRSupport

  LLVMSupport

  )

add_dependencies(MLIRAnalysis

  MLIRAffineOps
@@ -37,6 +30,8 @@ add_dependencies(MLIRAnalysis 
  MLIRLoopOps

  )



target_link_libraries(MLIRAnalysis MLIRAffineOps MLIRLoopOps)



add_llvm_library(MLIRLoopAnalysis

  AffineAnalysis.cpp

  AffineStructures.cpp
@@ -46,14 +41,6 @@ add_llvm_library(MLIRLoopAnalysis 


  ADDITIONAL_HEADER_DIRS

  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis



  LINK_LIBS

  MLIRAffineOps

  MLIRIR

  MLIRLoopOps

  MLIRStandardOps

  MLIRSupport

  LLVMSupport

  )

add_dependencies(MLIRLoopAnalysis

  MLIRAffineOps
@@ -61,3 +48,5 @@ add_dependencies(MLIRLoopAnalysis 
  MLIRTypeInferOpInterfaceIncGen

  MLIRLoopOps

  )



target_link_libraries(MLIRLoopAnalysis MLIRAffineOps MLIRLoopOps)

mlir/lib/Conversion/AffineToStandard/CMakeLists.txt

+8 −6
Original line number Diff line number Diff line
@@ -3,22 +3,24 @@ add_mlir_conversion_library(MLIRAffineToStandard 


  ADDITIONAL_HEADER_DIRS

  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/AffineToStandard

)

add_dependencies(

  MLIRAffineToStandard



  LINK_LIBS

  MLIRAffineOps

  MLIRLoopOps

  MLIRPass

  MLIRStandardOps

  MLIRTransforms

  MLIRIR

  LLVMCore

  LLVMSupport

)

add_dependencies(

target_link_libraries(

  MLIRAffineToStandard



  MLIRAffineOps

  MLIRLoopOps

  MLIRPass

  MLIRStandardOps

  MLIRTransforms

  MLIRIR

  LLVMCore

  LLVMSupport

mlir/lib/Conversion/GPUToCUDA/CMakeLists.txt

+3 −7
Original line number Diff line number Diff line
@@ -10,12 +10,8 @@ if (MLIR_CUDA_CONVERSIONS_ENABLED) 
 list(APPEND SOURCES "ConvertKernelFuncToCubin.cpp")

endif()



add_mlir_conversion_library(MLIRGPUtoCUDATransforms

  ${SOURCES}

  LINK_LIBS

  LLVMNVPTXCodeGen

  LLVMNVPTXDesc

  LLVMNVPTXInfo

add_mlir_conversion_library(MLIRGPUtoCUDATransforms ${SOURCES})

target_link_libraries(MLIRGPUtoCUDATransforms

  MLIRGPU

  MLIRLLVMIR

  MLIRNVVMIR