diff --git a/mlir/examples/toy/Ch2/CMakeLists.txt b/mlir/examples/toy/Ch2/CMakeLists.txt
--- a/mlir/examples/toy/Ch2/CMakeLists.txt
+++ b/mlir/examples/toy/Ch2/CMakeLists.txt
@@ -9,10 +9,13 @@
   parser/AST.cpp
   mlir/MLIRGen.cpp
   mlir/Dialect.cpp
+
+  DEPENDS
+  ToyCh2OpsIncGen
+
   )
 include_directories(include/)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
-add_dependencies(toyc-ch2 ToyCh2OpsIncGen)
 target_link_libraries(toyc-ch2
   PRIVATE
     MLIRAnalysis
diff --git a/mlir/examples/toy/Ch3/CMakeLists.txt b/mlir/examples/toy/Ch3/CMakeLists.txt
--- a/mlir/examples/toy/Ch3/CMakeLists.txt
+++ b/mlir/examples/toy/Ch3/CMakeLists.txt
@@ -14,10 +14,12 @@
   mlir/MLIRGen.cpp
   mlir/Dialect.cpp
   mlir/ToyCombine.cpp
+
+  DEPENDS
+  ToyCh3OpsIncGen
+  ToyCh3CombineIncGen
   )
 
-add_dependencies(toyc-ch3 ToyCh3OpsIncGen)
-add_dependencies(toyc-ch3 ToyCh3CombineIncGen)
 include_directories(include/)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
diff --git a/mlir/examples/toy/Ch4/CMakeLists.txt b/mlir/examples/toy/Ch4/CMakeLists.txt
--- a/mlir/examples/toy/Ch4/CMakeLists.txt
+++ b/mlir/examples/toy/Ch4/CMakeLists.txt
@@ -15,12 +15,14 @@
   mlir/Dialect.cpp
   mlir/ShapeInferencePass.cpp
   mlir/ToyCombine.cpp
+
+  DEPENDS
+  ToyCh4OpsIncGen
+  ToyCh4ShapeInferenceInterfaceIncGen
+  ToyCh4CombineIncGen
+  MLIRCallOpInterfacesIncGen
   )
 
-add_dependencies(toyc-ch4 ToyCh4OpsIncGen)
-add_dependencies(toyc-ch4 ToyCh4ShapeInferenceInterfaceIncGen)
-add_dependencies(toyc-ch4 ToyCh4CombineIncGen)
-add_dependencies(toyc-ch4 MLIRCallOpInterfacesIncGen)
 include_directories(include/)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
diff --git a/mlir/examples/toy/Ch5/CMakeLists.txt b/mlir/examples/toy/Ch5/CMakeLists.txt
--- a/mlir/examples/toy/Ch5/CMakeLists.txt
+++ b/mlir/examples/toy/Ch5/CMakeLists.txt
@@ -16,12 +16,14 @@
   mlir/LowerToAffineLoops.cpp
   mlir/ShapeInferencePass.cpp
   mlir/ToyCombine.cpp
+
+  DEPENDS
+  ToyCh5ShapeInferenceInterfaceIncGen
+  ToyCh5OpsIncGen
+  ToyCh5CombineIncGen
+  MLIRCallOpInterfacesIncGen
   )
 
-add_dependencies(toyc-ch5 ToyCh5ShapeInferenceInterfaceIncGen)
-add_dependencies(toyc-ch5 ToyCh5OpsIncGen)
-add_dependencies(toyc-ch5 ToyCh5CombineIncGen)
-add_dependencies(toyc-ch5 MLIRCallOpInterfacesIncGen)
 include_directories(include/)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
diff --git a/mlir/examples/toy/Ch6/CMakeLists.txt b/mlir/examples/toy/Ch6/CMakeLists.txt
--- a/mlir/examples/toy/Ch6/CMakeLists.txt
+++ b/mlir/examples/toy/Ch6/CMakeLists.txt
@@ -18,12 +18,14 @@
   mlir/LowerToLLVM.cpp
   mlir/ShapeInferencePass.cpp
   mlir/ToyCombine.cpp
+
+  DEPENDS
+  ToyCh6ShapeInferenceInterfaceIncGen
+  ToyCh6OpsIncGen
+  ToyCh6CombineIncGen
+  MLIRCallOpInterfacesIncGen
   )
 
-add_dependencies(toyc-ch6 ToyCh6ShapeInferenceInterfaceIncGen)
-add_dependencies(toyc-ch6 ToyCh6OpsIncGen)
-add_dependencies(toyc-ch6 ToyCh6CombineIncGen)
-add_dependencies(toyc-ch6 MLIRCallOpInterfacesIncGen)
 include_directories(include/)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
diff --git a/mlir/examples/toy/Ch7/CMakeLists.txt b/mlir/examples/toy/Ch7/CMakeLists.txt
--- a/mlir/examples/toy/Ch7/CMakeLists.txt
+++ b/mlir/examples/toy/Ch7/CMakeLists.txt
@@ -18,12 +18,14 @@
   mlir/LowerToLLVM.cpp
   mlir/ShapeInferencePass.cpp
   mlir/ToyCombine.cpp
+
+  DEPENDS
+  ToyCh7ShapeInferenceInterfaceIncGen
+  ToyCh7OpsIncGen
+  ToyCh7CombineIncGen
+  MLIRCallOpInterfacesIncGen
   )
 
-add_dependencies(toyc-ch7 ToyCh7ShapeInferenceInterfaceIncGen)
-add_dependencies(toyc-ch7 ToyCh7OpsIncGen)
-add_dependencies(toyc-ch7 ToyCh7CombineIncGen)
-add_dependencies(toyc-ch7 MLIRCallOpInterfacesIncGen)
 include_directories(include/)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
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
@@ -23,6 +23,10 @@
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
 
+  DEPENDS
+  MLIRCallOpInterfacesIncGen
+  MLIRTypeInferOpInterfaceIncGen
+
   LINK_LIBS
   MLIRAffineOps
   MLIRIR
@@ -30,10 +34,6 @@
   MLIRSupport
   LLVMSupport
   )
-add_dependencies(MLIRAnalysis
-  MLIRCallOpInterfacesIncGen
-  MLIRTypeInferOpInterfaceIncGen
-  )
 
 add_llvm_library(MLIRLoopAnalysis
   AffineAnalysis.cpp
@@ -45,6 +45,10 @@
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
 
+  DEPENDS
+  MLIRCallOpInterfacesIncGen
+  MLIRTypeInferOpInterfaceIncGen
+
   LINK_LIBS
   MLIRAffineOps
   MLIRIR
@@ -53,7 +57,3 @@
   MLIRSupport
   LLVMSupport
   )
-add_dependencies(MLIRLoopAnalysis
-  MLIRCallOpInterfacesIncGen
-  MLIRTypeInferOpInterfaceIncGen
-  )
diff --git a/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt b/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
--- a/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt
@@ -5,6 +5,9 @@
 add_mlir_conversion_library(MLIRGPUtoNVVMTransforms
   LowerGpuOpsToNVVMOps.cpp
 
+  DEPENDS
+  MLIRGPUToNVVMIncGen
+
   LINK_LIBS
   LLVMCore
   LLVMSupport
@@ -19,6 +22,3 @@
   MLIRTransforms
   MLIRTransformUtils
   )
-
-add_dependencies(MLIRGPUtoNVVMTransforms
-  MLIRGPUToNVVMIncGen)
diff --git a/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
--- a/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt
@@ -6,6 +6,9 @@
   ConvertGPUToSPIRV.cpp
   ConvertGPUToSPIRVPass.cpp
 
+  DEPENDS
+  MLIRGPUToSPIRVIncGen
+
   LINK_LIBS
   MLIRGPU
   MLIRIR
@@ -18,6 +21,3 @@
   MLIRTransforms
   LLVMSupport
   )
-
-add_dependencies(MLIRGPUtoSPIRVTransforms
-  MLIRGPUToSPIRVIncGen)
diff --git a/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
--- a/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
+++ b/mlir/lib/Conversion/StandardToSPIRV/CMakeLists.txt
@@ -11,6 +11,9 @@
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/IR
 
+  DEPENDS
+  MLIRStandardToSPIRVIncGen
+
   LINK_LIBS
   MLIRIR
   MLIRPass
@@ -22,6 +25,3 @@
   MLIRStandardOps
   LLVMSupport
   )
-
-add_dependencies(MLIRStandardToSPIRVTransforms
-  MLIRStandardToSPIRVIncGen)
diff --git a/mlir/lib/Dialect/AffineOps/CMakeLists.txt b/mlir/lib/Dialect/AffineOps/CMakeLists.txt
--- a/mlir/lib/Dialect/AffineOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/AffineOps/CMakeLists.txt
@@ -6,13 +6,13 @@
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/AffineOps
 
+  DEPENDS
+  MLIRAffineOpsIncGen
+  MLIRLoopLikeInterfaceIncGen
+
   LINK_LIBS
   MLIREDSC
   MLIRIR
   MLIRStandardOps
   LLVMSupport
   )
-add_dependencies(MLIRAffineOps
-  MLIRAffineOpsIncGen
-  MLIRLoopLikeInterfaceIncGen
-  )
diff --git a/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt b/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
--- a/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/FxpMathOps/CMakeLists.txt
@@ -5,6 +5,9 @@
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/FxpMathOps
 
+  DEPENDS
+  MLIRFxpMathOpsIncGen
+
   LINK_LIBS
   MLIRQuantOps
   MLIRIR
@@ -15,6 +18,3 @@
   MLIRTransformUtils
   LLVMSupport
   )
-add_dependencies(MLIRFxpMathOps
-  MLIRFxpMathOpsIncGen
-  )
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
@@ -8,6 +8,9 @@
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/GPU
 
+  DEPENDS
+  MLIRGPUOpsIncGen
+
   LINK_LIBS
   MLIREDSC
   MLIRIR
@@ -19,6 +22,3 @@
   MLIRTransformUtils
   LLVMSupport
   )
-add_dependencies(MLIRGPU
-  MLIRGPUOpsIncGen
-  )
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
@@ -4,6 +4,10 @@
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
 
+  DEPENDS
+  MLIRLLVMOpsIncGen
+  MLIRLLVMConversionsIncGen
+
   LINK_LIBS
   LLVMAsmParser
   LLVMCore
@@ -11,10 +15,6 @@
   MLIRIR
   MLIRSupport
   )
-add_dependencies(MLIRLLVMIR
-  MLIRLLVMOpsIncGen
-  MLIRLLVMConversionsIncGen
-  )
 
 add_mlir_dialect_library(MLIRNVVMIR
   IR/NVVMDialect.cpp
@@ -22,6 +22,10 @@
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR
 
+  DEPENDS
+  MLIRNVVMOpsIncGen
+  MLIRNVVMConversionsIncGen
+
   LINK_LIBS
   LLVMAsmParser
   MLIRIR
@@ -29,12 +33,6 @@
   LLVMSupport
   LLVMCore
   )
-add_dependencies(MLIRNVVMIR
-  MLIRNVVMOpsIncGen
-  MLIRNVVMConversionsIncGen
-  )
-
-
 
 add_mlir_dialect_library(MLIRROCDLIR
   IR/ROCDLDialect.cpp
@@ -42,13 +40,13 @@
   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
--- a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
@@ -7,8 +7,10 @@
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Linalg
+
   DEPENDS
   intrinsics_gen
+  MLIRLinalgTransformPatternsIncGen
 
   LINK_LIBS
   MLIRAffineOps
@@ -27,6 +29,3 @@
   MLIRVectorOps
   LLVMSupport
   )
-add_dependencies(MLIRLinalgTransforms
-  MLIRLinalgTransformPatternsIncGen
-  )
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
@@ -5,6 +5,10 @@
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/LoopOps
+  
+  DEPENDS
+  MLIRLoopLikeInterfaceIncGen
+  MLIRLoopOpsIncGen
 
   LINK_LIBS
   MLIREDSC
@@ -12,9 +16,5 @@
   MLIRStandardOps
   LLVMSupport
   )
-add_dependencies(MLIRLoopOps
-  MLIRLoopLikeInterfaceIncGen
-  MLIRLoopOpsIncGen
-  )
 
 add_subdirectory(Transforms)
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
@@ -4,10 +4,11 @@
   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
--- a/mlir/lib/Dialect/QuantOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/QuantOps/CMakeLists.txt
@@ -12,6 +12,9 @@
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/QuantOps
 
+  DEPENDS
+  MLIRQuantOpsIncGen
+
   LINK_LIBS
   MLIRIR
   MLIRPass
@@ -20,6 +23,3 @@
   MLIRTransformUtils
   LLVMSupport
   )
-add_dependencies(MLIRQuantOps
-  MLIRQuantOpsIncGen
-  )
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
@@ -14,6 +14,15 @@
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
 
+  DEPENDS
+  MLIRSPIRVAvailabilityIncGen
+  MLIRSPIRVCanonicalizationIncGen
+  MLIRSPIRVEnumAvailabilityIncGen
+  MLIRSPIRVEnumsIncGen
+  MLIRSPIRVOpsIncGen
+  MLIRSPIRVOpUtilsGen
+  MLIRSPIRVTargetAndABIIncGen
+
   LINK_LIBS
   MLIRIR
   MLIRParser
@@ -23,15 +32,5 @@
   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
--- a/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
+++ b/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
@@ -7,6 +7,9 @@
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
 
+  DEPENDS
+  MLIRSPIRVSerializationGen
+
   LINK_LIBS
   MLIRIR
   MLIRParser
@@ -15,6 +18,3 @@
   MLIRTranslation
   LLVMSupport
   )
-
-add_dependencies(MLIRSPIRVSerialization
-  MLIRSPIRVSerializationGen)
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
@@ -5,6 +5,10 @@
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/StandardOps
+  
+  DEPENDS
+  MLIRCallOpInterfacesIncGen
+  MLIRStandardOpsIncGen
 
   LINK_LIBS
   MLIREDSC
@@ -13,7 +17,3 @@
   LLVMCore
   LLVMSupport
   )
-add_dependencies(MLIRStandardOps
-  MLIRCallOpInterfacesIncGen
-  MLIRStandardOpsIncGen
-  )
diff --git a/mlir/lib/Dialect/VectorOps/CMakeLists.txt b/mlir/lib/Dialect/VectorOps/CMakeLists.txt
--- a/mlir/lib/Dialect/VectorOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/VectorOps/CMakeLists.txt
@@ -7,6 +7,10 @@
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/VectorOps
 
+  DEPENDS
+  MLIRVectorOpsIncGen
+  MLIRVectorTransformPatternsIncGen
+
   LINK_LIBS
   MLIRIR
   MLIRStandardOps
@@ -16,6 +20,3 @@
   LLVMSupport
   )
 
-add_dependencies(MLIRVectorOps MLIRVectorOpsIncGen)
-add_dependencies(MLIRVectorOps MLIRVectorTransformPatternsIncGen)
-
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
@@ -5,12 +5,12 @@
   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/Quantizer/CMakeLists.txt b/mlir/lib/Quantizer/CMakeLists.txt
--- a/mlir/lib/Quantizer/CMakeLists.txt
+++ b/mlir/lib/Quantizer/CMakeLists.txt
@@ -24,6 +24,9 @@
 
   ADDITIONAL_HEADER_DIRS
 
+  DEPENDS
+  MLIRFxpMathOpsIncGen
+
   LINK_LIBS
   MLIRIR
   MLIRFxpMathOps
@@ -34,10 +37,6 @@
   LLVMSupport
   )
 
-add_dependencies(MLIRQuantizerFxpMathConfig
-  MLIRFxpMathOpsIncGen
-  )
-
 # Transforms.
 add_llvm_library(MLIRQuantizerTransforms
   Transforms/AddDefaultStatsTestPass.cpp
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
@@ -27,6 +27,10 @@
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
 
+  DEPENDS
+  MLIRLoopLikeInterfaceIncGen
+  MLIRStandardOpsIncGen
+
   LINK_LIBS
   MLIRAffineOps
   MLIRAnalysis
@@ -40,7 +44,3 @@
   MLIRVectorOps
   LLVMSupport
   )
-
-add_dependencies(MLIRTransforms
-  MLIRLoopLikeInterfaceIncGen
-  MLIRStandardOpsIncGen)
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
@@ -10,6 +10,9 @@
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
 
+  DEPENDS
+  MLIRStandardOpsIncGen
+
   LINK_LIBS
   MLIRAffineOps
   MLIRAnalysis
@@ -20,4 +23,3 @@
   MLIRStandardOps
   LLVMSupport
   )
-add_dependencies(MLIRTransformUtils MLIRStandardOpsIncGen)
diff --git a/mlir/test/lib/TestDialect/CMakeLists.txt b/mlir/test/lib/TestDialect/CMakeLists.txt
--- a/mlir/test/lib/TestDialect/CMakeLists.txt
+++ b/mlir/test/lib/TestDialect/CMakeLists.txt
@@ -15,6 +15,10 @@
   TestDialect.cpp
   TestPatterns.cpp
 
+  DEPENDS
+  MLIRTestOpsIncGen
+  MLIRTypeInferOpInterfaceIncGen
+
   LINK_LIBS
   MLIRAnalysis
   MLIRDialect
@@ -25,7 +29,3 @@
   MLIRTransformUtils
   LLVMSupport
 )
-add_dependencies(MLIRTestDialect
-  MLIRTestOpsIncGen
-  MLIRTypeInferOpInterfaceIncGen
-)
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
@@ -23,6 +23,11 @@
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Transforms
 
+  DEPENDS
+  MLIRStandardOpsIncGen
+  MLIRTestLinalgTransformPatternsIncGen
+  MLIRTestVectorTransformPatternsIncGen
+
   LINK_LIBS
   MLIRAffineOps
   MLIRAnalysis
@@ -47,6 +52,3 @@
 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/mlir-cuda-runner/CMakeLists.txt b/mlir/tools/mlir-cuda-runner/CMakeLists.txt
--- a/mlir/tools/mlir-cuda-runner/CMakeLists.txt
+++ b/mlir/tools/mlir-cuda-runner/CMakeLists.txt
@@ -68,8 +68,10 @@
 
   add_llvm_tool(mlir-cuda-runner
     mlir-cuda-runner.cpp
-  )
-  add_dependencies(mlir-cuda-runner cuda-runtime-wrappers)
+
+    DEPENDS
+    cuda-runtime-wrappers
+    )
   target_include_directories(mlir-cuda-runner
     PRIVATE ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
   )