diff --git a/mlir/lib/Dialect/LLVMIR/CMakeLists.txt b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
@@ -4,49 +4,51 @@ add_mlir_dialect_library(MLIRLLVMIR
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
 
-  DEPENDS
-  MLIRLLVMOpsIncGen
-  MLIRLLVMConversionsIncGen
-
   LINK_LIBS
   LLVMAsmParser
   LLVMCore
   LLVMSupport
   MLIRIR
   MLIRSupport
   )
+add_dependencies(MLIRLLVMIR
+  MLIRLLVMOpsIncGen
+  MLIRLLVMConversionsIncGen
+  )
 
 add_mlir_dialect_library(MLIRNVVMIR
   IR/NVVMDialect.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
 
-  DEPENDS
-  MLIRNVVMOpsIncGen
-  MLIRNVVMConversionsIncGen
-
   LINK_LIBS
   LLVMAsmParser
   MLIRIR
   MLIRLLVMIR
   LLVMSupport
   LLVMCore
   )
+add_dependencies(MLIRNVVMIR
+  MLIRNVVMOpsIncGen
+  MLIRNVVMConversionsIncGen
+  )
+
+
 
 add_mlir_dialect_library(MLIRROCDLIR
   IR/ROCDLDialect.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
 
-  DEPENDS
-  MLIRROCDLOpsIncGen
-  MLIRROCDLConversionsIncGen
-
   LINK_LIBS
   LLVMAsmParser
   LLVMCore
   LLVMSupport
   MLIRIR
   )
+add_dependencies(MLIRROCDLIR
+  MLIRROCDLOpsIncGen
+  MLIRROCDLConversionsIncGen
+  )
diff --git a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
@@ -7,10 +7,8 @@ add_mlir_dialect_library(MLIRLinalgTransforms
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
-
   DEPENDS
   intrinsics_gen
-  MLIRLinalgTransformPatternsIncGen
 
   LINK_LIBS
   MLIRAffineOps
@@ -29,3 +27,6 @@ add_mlir_dialect_library(MLIRLinalgTransforms
   MLIRVectorOps
   LLVMSupport
   )
+add_dependencies(MLIRLinalgTransforms
+  MLIRLinalgTransformPatternsIncGen
+  )
diff --git a/mlir/lib/Dialect/LoopOps/CMakeLists.txt b/mlir/lib/Dialect/LoopOps/CMakeLists.txt
@@ -6,15 +6,15 @@ add_mlir_dialect_library(MLIRLoopOps
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/LoopOps
 
-  DEPENDS
-  MLIRLoopLikeInterfaceIncGen
-  MLIRLoopOpsIncGen
-
   LINK_LIBS
   MLIREDSC
   MLIRIR
   MLIRStandardOps
   LLVMSupport
   )
+add_dependencies(MLIRLoopOps
+  MLIRLoopLikeInterfaceIncGen
+  MLIRLoopOpsIncGen
+  )
 
 add_subdirectory(Transforms)
diff --git a/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt b/mlir/lib/Dialect/LoopOps/Transforms/CMakeLists.txt
@@ -5,13 +5,9 @@ add_mlir_dialect_library(MLIRLoopOpsTransforms
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LoopOps
+  )
 
-  LINK_LIBS
-  MLIRAffineOps
-  MLIRIR
+target_link_libraries(MLIRLoopOpsTransforms
   MLIRPass
   MLIRLoopOps
-  MLIRStandardOps
-  MLIRSupport
-  LLVMSupport
   )
diff --git a/mlir/lib/Dialect/OpenMP/CMakeLists.txt b/mlir/lib/Dialect/OpenMP/CMakeLists.txt
@@ -4,11 +4,10 @@ add_mlir_dialect_library(MLIROpenMP
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/OpenMP
 
-  DEPENDS
-  MLIROpenMPOpsIncGen
-
   LINK_LIBS
   MLIRIR
   LLVMCore
   LLVMSupport
   )
+
+add_dependencies(MLIROpenMP MLIROpenMPOpsIncGen)
diff --git a/mlir/lib/Dialect/QuantOps/CMakeLists.txt b/mlir/lib/Dialect/QuantOps/CMakeLists.txt
@@ -12,9 +12,6 @@ add_mlir_dialect_library(MLIRQuantOps
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/QuantOps
 
-  DEPENDS
-  MLIRQuantOpsIncGen
-
   LINK_LIBS
   MLIRIR
   MLIRPass
@@ -23,3 +20,6 @@ add_mlir_dialect_library(MLIRQuantOps
   MLIRTransformUtils
   LLVMSupport
   )
+add_dependencies(MLIRQuantOps
+  MLIRQuantOpsIncGen
+  )
diff --git a/mlir/lib/Dialect/SPIRV/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/CMakeLists.txt
@@ -14,15 +14,6 @@ add_mlir_dialect_library(MLIRSPIRV
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
 
-  DEPENDS
-  MLIRSPIRVAvailabilityIncGen
-  MLIRSPIRVCanonicalizationIncGen
-  MLIRSPIRVEnumAvailabilityIncGen
-  MLIRSPIRVEnumsIncGen
-  MLIRSPIRVOpsIncGen
-  MLIRSPIRVOpUtilsGen
-  MLIRSPIRVTargetAndABIIncGen
-
   LINK_LIBS
   MLIRIR
   MLIRParser
@@ -32,5 +23,15 @@ add_mlir_dialect_library(MLIRSPIRV
   LLVMSupport
   )
 
+add_dependencies(MLIRSPIRV
+  MLIRSPIRVAvailabilityIncGen
+  MLIRSPIRVCanonicalizationIncGen
+  MLIRSPIRVEnumAvailabilityIncGen
+  MLIRSPIRVEnumsIncGen
+  MLIRSPIRVOpsIncGen
+  MLIRSPIRVOpUtilsGen
+  MLIRSPIRVTargetAndABIIncGen)
+
+
 add_subdirectory(Serialization)
 add_subdirectory(Transforms)
diff --git a/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
@@ -7,9 +7,6 @@ add_mlir_dialect_library(MLIRSPIRVSerialization
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
 
-  DEPENDS
-  MLIRSPIRVSerializationGen
-
   LINK_LIBS
   MLIRIR
   MLIRParser
@@ -18,3 +15,6 @@ add_mlir_dialect_library(MLIRSPIRVSerialization
   MLIRTranslation
   LLVMSupport
   )
+
+add_dependencies(MLIRSPIRVSerialization
+  MLIRSPIRVSerializationGen)
diff --git a/mlir/lib/Dialect/StandardOps/CMakeLists.txt b/mlir/lib/Dialect/StandardOps/CMakeLists.txt
@@ -6,14 +6,14 @@ add_mlir_dialect_library(MLIRStandardOps
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/StandardOps
 
-  DEPENDS
-  MLIRCallOpInterfacesIncGen
-  MLIRStandardOpsIncGen
-
   LINK_LIBS
   MLIREDSC
   MLIRIR
   MLIRSupport
   LLVMCore
   LLVMSupport
   )
+add_dependencies(MLIRStandardOps
+  MLIRCallOpInterfacesIncGen
+  MLIRStandardOpsIncGen
+  )
diff --git a/mlir/lib/Dialect/VectorOps/CMakeLists.txt b/mlir/lib/Dialect/VectorOps/CMakeLists.txt
@@ -7,16 +7,14 @@ add_mlir_dialect_library(MLIRVectorOps
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/VectorOps
 
-  DEPENDS
-  MLIRVectorOpsIncGen
-  MLIRVectorTransformPatternsIncGen
-
   LINK_LIBS
-  MLIREDSC
   MLIRIR
   MLIRStandardOps
   MLIRAffineOps
   MLIRLoopOps
   MLIRLoopAnalysis
   LLVMSupport
   )
+
+add_dependencies(MLIRVectorOps MLIRVectorOpsIncGen)
+add_dependencies(MLIRVectorOps MLIRVectorTransformPatternsIncGen)
diff --git a/mlir/lib/EDSC/CMakeLists.txt b/mlir/lib/EDSC/CMakeLists.txt
@@ -3,7 +3,7 @@ set(LLVM_OPTIONAL_SOURCES
   CoreAPIs.cpp
   )
 
-add_mlir_library(MLIREDSC
+add_llvm_library(MLIREDSC
   Builders.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -15,7 +15,7 @@ add_mlir_library(MLIREDSC
   LLVMSupport
   )
 
-add_mlir_library(MLIREDSCInterface
+add_llvm_library(MLIREDSCInterface
   CoreAPIs.cpp
 
   ADDITIONAL_HEADER_DIRS

diff --git a/mlir/lib/ExecutionEngine/CMakeLists.txt b/mlir/lib/ExecutionEngine/CMakeLists.txt
@@ -6,7 +6,7 @@ set(LLVM_OPTIONAL_SOURCES
   )
 
 llvm_map_components_to_libnames(outlibs "nativecodegen" "IPO")
-add_mlir_library(MLIRExecutionEngine
+add_llvm_library(MLIRExecutionEngine
   ExecutionEngine.cpp
   OptUtils.cpp
 

diff --git a/mlir/lib/IR/CMakeLists.txt b/mlir/lib/IR/CMakeLists.txt
@@ -1,16 +1,16 @@
 file(GLOB globbed *.c *.cpp)
-add_mlir_library(MLIRIR
+add_llvm_library(MLIRIR
   ${globbed}
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
 
-  DEPENDS
-  MLIRCallOpInterfacesIncGen
-  MLIROpAsmInterfacesIncGen
-
   LINK_LIBS
   MLIRSupport
   LLVMSupport
   ${LLVM_PTHREAD_LIB}
   )
+add_dependencies(MLIRIR
+  MLIRCallOpInterfacesIncGen
+  MLIROpAsmInterfacesIncGen
+  )
diff --git a/mlir/lib/Parser/CMakeLists.txt b/mlir/lib/Parser/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_library(MLIRParser
+add_llvm_library(MLIRParser
   Lexer.cpp
   Parser.cpp
   Token.cpp

diff --git a/mlir/lib/Pass/CMakeLists.txt b/mlir/lib/Pass/CMakeLists.txt
@@ -1,5 +1,5 @@
 file(GLOB globbed *.c *.cpp)
-add_mlir_library(MLIRPass
+add_llvm_library(MLIRPass
   ${globbed}
 
   ADDITIONAL_HEADER_DIRS

diff --git a/mlir/lib/Quantizer/CMakeLists.txt b/mlir/lib/Quantizer/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Support.
-add_mlir_library(MLIRQuantizerSupport
+add_llvm_library(MLIRQuantizerSupport
   Support/Configuration.cpp
   Support/ConstraintAnalysisGraph.cpp
   Support/Metadata.cpp
@@ -19,14 +19,11 @@ add_mlir_library(MLIRQuantizerSupport
   )
 
 # Configurations.
-add_mlir_library(MLIRQuantizerFxpMathConfig
+add_llvm_library(MLIRQuantizerFxpMathConfig
   Configurations/FxpMathConfig.cpp
 
   ADDITIONAL_HEADER_DIRS
 
-  DEPENDS
-  MLIRFxpMathOpsIncGen
-
   LINK_LIBS
   MLIRIR
   MLIRFxpMathOps
@@ -37,8 +34,12 @@ add_mlir_library(MLIRQuantizerFxpMathConfig
   LLVMSupport
   )
 
+add_dependencies(MLIRQuantizerFxpMathConfig
+  MLIRFxpMathOpsIncGen
+  )
+
 # Transforms.
-add_mlir_library(MLIRQuantizerTransforms
+add_llvm_library(MLIRQuantizerTransforms
   Transforms/AddDefaultStatsTestPass.cpp
   Transforms/InferQuantizedTypesPass.cpp
   Transforms/RemoveInstrumentationPass.cpp

diff --git a/mlir/lib/Support/CMakeLists.txt b/mlir/lib/Support/CMakeLists.txt
@@ -7,7 +7,7 @@ set(LLVM_OPTIONAL_SOURCES
   TranslateClParser.cpp
 )
 
-add_mlir_library(MLIRSupport
+add_llvm_library(MLIRSupport
   FileUtilities.cpp
   StorageUniquer.cpp
   ToolUtilities.cpp
@@ -20,7 +20,7 @@ add_mlir_library(MLIRSupport
   ${LLVM_PTHREAD_LIB}
   )
 
-add_mlir_library(MLIROptLib
+add_llvm_library(MLIROptLib
   MlirOptMain.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -34,7 +34,7 @@ add_mlir_library(MLIROptLib
   LLVMSupport
   )
 
-add_mlir_library(MLIRTranslateClParser
+add_llvm_library(MLIRTranslateClParser
   TranslateClParser.cpp
 
   ADDITIONAL_HEADER_DIRS

diff --git a/mlir/lib/Target/CMakeLists.txt b/mlir/lib/Target/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_library(MLIRTargetLLVMIRModuleTranslation
+add_llvm_library(MLIRTargetLLVMIRModuleTranslation
   LLVMIR/DebugTranslation.cpp
   LLVMIR/ModuleTranslation.cpp
 
@@ -19,7 +19,7 @@ add_mlir_library(MLIRTargetLLVMIRModuleTranslation
   MLIRTranslation
   )
 
-add_mlir_library(MLIRTargetLLVMIR
+add_llvm_library(MLIRTargetLLVMIR
   LLVMIR/ConvertFromLLVMIR.cpp
   LLVMIR/ConvertToLLVMIR.cpp
 
@@ -36,8 +36,7 @@ add_mlir_library(MLIRTargetLLVMIR
   LLVMIRReader
   LLVMSupport
   )
-
-add_mlir_library(MLIRTargetNVVMIR
+add_llvm_library(MLIRTargetNVVMIR
   LLVMIR/ConvertToNVVMIR.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -57,7 +56,7 @@ add_mlir_library(MLIRTargetNVVMIR
   LLVMSupport
   )
 
-add_mlir_library(MLIRTargetROCDLIR
+add_llvm_library(MLIRTargetROCDLIR
   LLVMIR/ConvertToROCDLIR.cpp
 
   ADDITIONAL_HEADER_DIRS

diff --git a/mlir/lib/Transforms/CMakeLists.txt b/mlir/lib/Transforms/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(Utils)
 
-add_mlir_library(MLIRTransforms
+add_llvm_library(MLIRTransforms
   AffineDataCopyGeneration.cpp
   AffineLoopInvariantCodeMotion.cpp
   Canonicalizer.cpp
@@ -27,10 +27,6 @@ add_mlir_library(MLIRTransforms
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
 
-  DEPENDS
-  MLIRLoopLikeInterfaceIncGen
-  MLIRStandardOpsIncGen
-
   LINK_LIBS
   MLIRAffineOps
   MLIRAnalysis
@@ -44,3 +40,7 @@ add_mlir_library(MLIRTransforms
   MLIRVectorOps
   LLVMSupport
   )
+
+add_dependencies(MLIRTransforms
+  MLIRLoopLikeInterfaceIncGen
+  MLIRStandardOpsIncGen)
diff --git a/mlir/lib/Transforms/Utils/CMakeLists.txt b/mlir/lib/Transforms/Utils/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_library(MLIRTransformUtils
+add_llvm_library(MLIRTransformUtils
   FoldUtils.cpp
   GreedyPatternRewriteDriver.cpp
   InliningUtils.cpp
@@ -10,9 +10,6 @@ add_mlir_library(MLIRTransformUtils
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
 
-  DEPENDS
-  MLIRStandardOpsIncGen
-
   LINK_LIBS
   MLIRAffineOps
   MLIRAnalysis
@@ -23,3 +20,4 @@ add_mlir_library(MLIRTransformUtils
   MLIRStandardOps
   LLVMSupport
   )
+add_dependencies(MLIRTransformUtils MLIRStandardOpsIncGen)
diff --git a/mlir/lib/Translation/CMakeLists.txt b/mlir/lib/Translation/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_library(MLIRTranslation
+add_llvm_library(MLIRTranslation
   Translation.cpp
 
   ADDITIONAL_HEADER_DIRS

diff --git a/mlir/test/SDBM/CMakeLists.txt b/mlir/test/SDBM/CMakeLists.txt
@@ -8,7 +8,6 @@ target_link_libraries(mlir-sdbm-api-test
   PRIVATE
   MLIRIR
   MLIRSDBM
-  MLIRSupport
   LLVMCore
   LLVMSupport
 )

diff --git a/mlir/test/lib/TestDialect/CMakeLists.txt b/mlir/test/lib/TestDialect/CMakeLists.txt
@@ -15,10 +15,6 @@ add_llvm_library(MLIRTestDialect
   TestDialect.cpp
   TestPatterns.cpp
 
-  DEPENDS
-  MLIRTestOpsIncGen
-  MLIRTypeInferOpInterfaceIncGen
-
   LINK_LIBS
   MLIRAnalysis
   MLIRDialect
@@ -29,3 +25,7 @@ add_llvm_library(MLIRTestDialect
   MLIRTransformUtils
   LLVMSupport
 )
+add_dependencies(MLIRTestDialect
+  MLIRTestOpsIncGen
+  MLIRTypeInferOpInterfaceIncGen
+)
diff --git a/mlir/test/lib/Transforms/CMakeLists.txt b/mlir/test/lib/Transforms/CMakeLists.txt
@@ -23,11 +23,6 @@ add_llvm_library(MLIRTestTransforms
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
 
-  DEPENDS
-  MLIRStandardOpsIncGen
-  MLIRTestLinalgTransformPatternsIncGen
-  MLIRTestVectorTransformPatternsIncGen
-
   LINK_LIBS
   MLIRAffineOps
   MLIRAnalysis
@@ -52,3 +47,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../TestDialect)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../TestDialect)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../DeclarativeTransforms)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../DeclarativeTransforms)
+add_dependencies(MLIRTestTransforms MLIRStandardOpsIncGen)
+add_dependencies(MLIRTestTransforms MLIRTestLinalgTransformPatternsIncGen)
+add_dependencies(MLIRTestTransforms MLIRTestVectorTransformPatternsIncGen)
diff --git a/mlir/tools/CMakeLists.txt b/mlir/tools/CMakeLists.txt
@@ -4,4 +4,3 @@ add_subdirectory(mlir-opt)
 add_subdirectory(mlir-tblgen)
 add_subdirectory(mlir-translate)
 add_subdirectory(mlir-vulkan-runner)
-add_subdirectory(mlir-shlib)
diff --git a/mlir/tools/mlir-cpu-runner/CMakeLists.txt b/mlir/tools/mlir-cpu-runner/CMakeLists.txt
@@ -16,7 +16,4 @@ target_link_libraries(mlir-cpu-runner PRIVATE
   MLIRSupport
   LLVMCore
   LLVMSupport
-  LLVMX86CodeGen
-  LLVMX86Desc
-  LLVMX86Info
-  )
+)
diff --git a/mlir/tools/mlir-cuda-runner/CMakeLists.txt b/mlir/tools/mlir-cuda-runner/CMakeLists.txt
@@ -68,10 +68,8 @@ if(MLIR_CUDA_RUNNER_ENABLED)
 
   add_llvm_tool(mlir-cuda-runner
     mlir-cuda-runner.cpp
-
-    DEPENDS
-    cuda-runtime-wrappers
-    )
+  )
+  add_dependencies(mlir-cuda-runner cuda-runtime-wrappers)
   target_include_directories(mlir-cuda-runner
     PRIVATE ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
   )

diff --git a/mlir/tools/mlir-opt/CMakeLists.txt b/mlir/tools/mlir-opt/CMakeLists.txt
@@ -4,7 +4,6 @@ set(LLVM_OPTIONAL_SOURCES
 
 set(LIB_LIBS
   MLIRAnalysis
-  MLIRIR
   MLIRLLVMIR
   MLIROptLib
   MLIRParser

diff --git a/mlir/tools/mlir-shlib/CMakeLists.txt b/mlir/tools/mlir-shlib/CMakeLists.txt
diff --git a/mlir/tools/mlir-shlib/mlir-shlib.cpp b/mlir/tools/mlir-shlib/mlir-shlib.cpp