diff --git a/.cmakelintrc b/.cmakelintrc
index 206f9803cf0..d54939e3014 100644
--- a/.cmakelintrc
+++ b/.cmakelintrc
@@ -1,2 +1,3 @@
 # project has long lines
 filter=-linelength
+spaces=4
diff --git a/.editorconfig b/.editorconfig
index c104d5e006e..41f603bf63e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -19,3 +19,7 @@ max_line_length = 99
 [{**.yml, **.yaml, **.jinja}]
 indent_style = space
 indent_size = 4
+
+[{CMakeLists.txt,**.cmake}]
+indent_style = space
+indent_size = 4
diff --git a/docs/manual/developer/04_style_guide.md b/docs/manual/developer/04_style_guide.md
index f2672da334d..317e060dba4 100644
--- a/docs/manual/developer/04_style_guide.md
+++ b/docs/manual/developer/04_style_guide.md
@@ -508,10 +508,11 @@ or
 
 ## CMake
 
-* Shall use 2-space indentation
+* Shall use 4-space indentation
 * Shall use lower case for commands
 * Shall use commands, including `if` etc., without extra spaces before or after `(` and `)` (Eg. `command(<args>)`
 * `endif`, `endforeach`, and similar commands shall not have any arguments
+* Shall keep flowing `)` at same indentation as starting clause
 
 ## Markup Languages