Add cmake and clang format to pre-commit

.github/workflows/style.yml

@@ -33,13 +33,6 @@ jobs:
       run: |
         pip install ".[style]"
 
-    - name: Clang Format
-      run: ./script/clang-format --check
-
-    - name: CMake Format
-      if: ${{ always() }}
-      run: ./script/cmake-format --check
-
     - name: Add matching rule
       run: echo ::add-matcher::.github/flake8-matcher.json
 

.pre-commit-config.yaml

@@ -17,3 +17,18 @@ repos:
     rev: 23.11.0
     hooks:
     - id: black
+
+-   repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v17.0.5
+    hooks:
+    - id: clang-format
+      args: [ --style=file, --Werror]
+      exclude: .json
+
+-   repo: https://github.com/cheshirekow/cmake-format-precommit
+    rev: v0.6.10
+    hooks:
+    - id: cmake-format
+    - id: cmake-lint
+      exclude: FindFilesystem
+      args: [ "--disable:C0301,C0111,C0113" ]

README.md

@@ -150,6 +150,17 @@ If you checked out submodules without having git lfs installed, you can force gi
 git submodule foreach "git lfs pull"
 ```
 
+
+### Style requirements
+
+There are a set of style requirements, which are gathered in the `pre-commit`
+configuration, to have it automatically run on each commit do:
+
+``` sh
+$ pip install pre-commit
+$ pre-commit install
+```
+
 ### Trouble with setup
 
 If you encounter problems during install, try deleting the `_skbuild` folder before reinstalling.

src/clib/CMakeLists.txt

@@ -66,16 +66,14 @@ list(APPEND CMAKE_PREFIX_PATH "${_tmp_dir}")
 execute_process(
   COMMAND "${_python_executable}" -c
           "import resdata; print(resdata.get_include())"
-  OUTPUT_VARIABLE ECL_INCLUDE_DIRS
-  OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ECHO STDOUT COMMAND_ERROR_IS_FATAL
-  LAST)
+  OUTPUT_VARIABLE ECL_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE
+                  COMMAND_ECHO STDOUT COMMAND_ERROR_IS_FATAL LAST)
 
 execute_process(
   COMMAND "${_python_executable}" -c
           "import resdata; print(resdata.ResdataPrototype.lib._name)"
-  OUTPUT_VARIABLE ECL_LIBRARY
-  OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ECHO STDOUT COMMAND_ERROR_IS_FATAL
-  LAST)
+  OUTPUT_VARIABLE ECL_LIBRARY OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ECHO
+                  STDOUT COMMAND_ERROR_IS_FATAL LAST)
 
 add_library(resdata SHARED IMPORTED GLOBAL)
 set_target_properties(resdata PROPERTIES IMPORTED_LOCATION "${ECL_LIBRARY}"