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
@@ -1,16 +1 @@
-add_mlir_dialect_library(MLIRShape
-  IR/Shape.cpp
-
-  ADDITIONAL_HEADER_DIRS
-  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Shape
-
-  DEPENDS
-  MLIRShapeOpsIncGen
-
-  LINK_LIBS PUBLIC
-  MLIRControlFlowInterfaces
-  MLIRDialect
-  MLIRInferTypeOpInterface
-  MLIRIR
-  MLIRSideEffectInterfaces
-  )
+add_subdirectory(IR)
diff --git a/mlir/lib/Dialect/Shape/CMakeLists.txt b/mlir/lib/Dialect/Shape/IR/CMakeLists.txt
copy from mlir/lib/Dialect/Shape/CMakeLists.txt
copy to mlir/lib/Dialect/Shape/IR/CMakeLists.txt
--- a/mlir/lib/Dialect/Shape/CMakeLists.txt
+++ b/mlir/lib/Dialect/Shape/IR/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_mlir_dialect_library(MLIRShape
-  IR/Shape.cpp
+  Shape.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Shape