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
@@ -1,4 +1,4 @@
-add_llvm_library(MLIRAnalysis STATIC
+set(LLVM_OPTIONAL_SOURCES
   AffineAnalysis.cpp
   AffineStructures.cpp
   CallGraph.cpp
@@ -15,6 +15,23 @@
   Utils.cpp
   VectorAnalysis.cpp
   Verifier.cpp
+  )
+
+add_llvm_library(MLIRAnalysis
+  AffineAnalysis.cpp
+  AffineStructures.cpp
+  CallGraph.cpp
+  InferTypeOpInterface.cpp
+  Liveness.cpp
+  LoopAnalysis.cpp
+  MemRefBoundCheck.cpp
+  NestedMatcher.cpp
+  OpStats.cpp
+  SliceAnalysis.cpp
+  TestMemRefDependenceCheck.cpp
+  TestParallelismDetection.cpp
+  Utils.cpp
+  VectorAnalysis.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
@@ -26,4 +43,13 @@
   MLIRLoopOps
   MLIRVectorOps
   )
-target_link_libraries(MLIRAnalysis MLIRAffineOps MLIRLoopOps MLIRVectorOps)
+target_link_libraries(MLIRAnalysis MLIRPass MLIRAffineOps MLIRLoopOps MLIRVectorOps)
+
+add_llvm_library(MLIRVerifier
+  Dominance.cpp
+  Verifier.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
+  )
+target_link_libraries(MLIRVerifier MLIRAffineOps MLIRLoopOps MLIRVectorOps)
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
@@ -5,5 +5,5 @@
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Pass
   )
-add_dependencies(MLIRPass MLIRAnalysis MLIRIR LLVMSupport)
-target_link_libraries(MLIRPass MLIRAnalysis MLIRIR LLVMSupport)
+add_dependencies(MLIRPass MLIRVerifier MLIRIR LLVMSupport)
+target_link_libraries(MLIRPass MLIRVerifier MLIRIR LLVMSupport)