diff --git a/src/substrait/proto/CMakeLists.txt b/src/substrait/proto/CMakeLists.txt
index 5cdfe4a8..47af3530 100644
--- a/src/substrait/proto/CMakeLists.txt
+++ b/src/substrait/proto/CMakeLists.txt
@@ -84,6 +84,7 @@ add_library(substrait_proto ${PROTO_SRCS} ${PROTO_HDRS} ProtoUtils.cpp
 target_link_libraries(substrait_proto protobuf::libprotobuf)
 
 # Make sure we can see our own generated include files.
-target_include_directories(substrait_proto
-                           PUBLIC "${PROTO_OUTPUT_TOPLEVEL_DIR}/src"
-                           PUBLIC "${protobuf_SOURCE_DIR}/src")
+target_include_directories(
+  substrait_proto
+  PUBLIC "${PROTO_OUTPUT_TOPLEVEL_DIR}/src"
+  PUBLIC "${protobuf_SOURCE_DIR}/src")
diff --git a/src/substrait/textplan/CMakeLists.txt b/src/substrait/textplan/CMakeLists.txt
index cd11f4e8..2487fb28 100644
--- a/src/substrait/textplan/CMakeLists.txt
+++ b/src/substrait/textplan/CMakeLists.txt
@@ -25,12 +25,19 @@ add_library(parse_result ParseResult.cpp ParseResult.h)
 add_dependencies(symbol_table substrait_proto substrait_common absl::strings
                  fmt::fmt-header-only)
 
-target_link_libraries(symbol_table substrait_base_proto_visitor substrait_proto substrait_common substrait_expression
-                      absl::strings fmt::fmt-header-only date::date)
+target_link_libraries(
+  symbol_table
+  substrait_base_proto_visitor
+  substrait_proto
+  substrait_common
+  substrait_expression
+  absl::strings
+  fmt::fmt-header-only
+  date::date)
 
 # Provide access to the generated protobuffer headers hierarchy.
 target_include_directories(symbol_table
-        PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/../..")
+                           PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/../..")
 
 if(${SUBSTRAIT_CPP_BUILD_TESTING})
   add_subdirectory(tests)
diff --git a/src/substrait/textplan/converter/CMakeLists.txt b/src/substrait/textplan/converter/CMakeLists.txt
index d9a18316..dc2cfe77 100644
--- a/src/substrait/textplan/converter/CMakeLists.txt
+++ b/src/substrait/textplan/converter/CMakeLists.txt
@@ -14,18 +14,17 @@ set(TEXTPLAN_SRCS
     ParseBinary.cpp
     ParseBinary.h)
 
-add_library(substrait_base_proto_visitor
-            BasePlanProtoVisitor.cpp
-            BasePlanProtoVisitor.h)
+add_library(substrait_base_proto_visitor BasePlanProtoVisitor.cpp
+                                         BasePlanProtoVisitor.h)
 
 target_link_libraries(
-        substrait_base_proto_visitor
-        substrait_common
-        substrait_proto
-        error_listener
-        fmt::fmt-header-only
-        absl::status
-        absl::statusor)
+  substrait_base_proto_visitor
+  substrait_common
+  substrait_proto
+  error_listener
+  fmt::fmt-header-only
+  absl::status
+  absl::statusor)
 
 add_library(substrait_textplan_converter ${TEXTPLAN_SRCS})
 
diff --git a/src/substrait/textplan/tests/CMakeLists.txt b/src/substrait/textplan/tests/CMakeLists.txt
index a3325421..a2815a27 100644
--- a/src/substrait/textplan/tests/CMakeLists.txt
+++ b/src/substrait/textplan/tests/CMakeLists.txt
@@ -4,7 +4,8 @@ add_library(parse_result_matchers ParseResultMatchers.cpp ParseResultMatchers.h)
 
 add_dependencies(parse_result_matchers parse_result)
 
-target_link_libraries(parse_result_matchers parse_result symbol_table substrait_proto gmock)
+target_link_libraries(parse_result_matchers parse_result symbol_table
+                      substrait_proto gmock)
 
 add_test_case(
   symbol_table_test