diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index cf2d34fb48..da8621c99f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -31,3 +31,10 @@ repos:
       - id: clang-format
         name: Run clang-format on C/C++/etc. files
         exclude_types: ["jupyter", "json"]
+
+# Sort file and library lists in CMake files.
+-   repo: https://github.com/Hardcode84/3
+    rev: v0.3.0
+    hooks:
+    -   id: sort-cmake-lists
+        exclude: llvm-project/
diff --git a/water/lib/Pipelines/CMakeLists.txt b/water/lib/Pipelines/CMakeLists.txt
index 0c3f1e45e1..ce5798c13f 100644
--- a/water/lib/Pipelines/CMakeLists.txt
+++ b/water/lib/Pipelines/CMakeLists.txt
@@ -6,9 +6,9 @@ add_mlir_library(MLIRWaterPipelines
 
   LINK_LIBS PUBLIC
   MLIRIR
-  MLIRPass
-  MLIRTransforms
   MLIRNormalFormDialect
   MLIRNormalFormTransforms
+  MLIRPass
+  MLIRTransforms
   MLIRWaveTransforms
 )
diff --git a/water/tools/water-opt/CMakeLists.txt b/water/tools/water-opt/CMakeLists.txt
index 549dcf5dfa..54343ac60a 100644
--- a/water/tools/water-opt/CMakeLists.txt
+++ b/water/tools/water-opt/CMakeLists.txt
@@ -6,8 +6,8 @@ set(LIBS
         MLIRArithDialect
         MLIRGPUDialect
         MLIRGPUToLLVMIRTranslation
-        MLIRLLVMToLLVMIRTranslation
         MLIRLinalgTransformOps
+        MLIRLLVMToLLVMIRTranslation
         MLIRMemRefTransformOps
         MLIRNormalFormDialect
         MLIRNormalFormTransforms
diff --git a/waveasm/tools/waveasm-translate/CMakeLists.txt b/waveasm/tools/waveasm-translate/CMakeLists.txt
index 55591306e5..9d549703e6 100644
--- a/waveasm/tools/waveasm-translate/CMakeLists.txt
+++ b/waveasm/tools/waveasm-translate/CMakeLists.txt
@@ -21,10 +21,10 @@ target_link_libraries(waveasm-translate
   MLIRGPUDialect
   MLIRIR
   MLIRLLVMDialect
-  MLIRROCDLDialect
   MLIRMemRefDialect
   MLIRParser
   MLIRPass
+  MLIRROCDLDialect
   MLIRSCFDialect
   MLIRSupport
   MLIRTransforms