diff options
| -rw-r--r-- | CMakePresets.json | 17 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 3 | ||||
| -rw-r--r-- | Makefile | 3 |
3 files changed, 5 insertions, 18 deletions
diff --git a/CMakePresets.json b/CMakePresets.json index 62abb2697f..22077a64a5 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -1,5 +1,5 @@ { - "version": 6, + "version": 3, "configurePresets": [ { "name": "base", @@ -94,20 +94,5 @@ "name": "iwyu", "configurePreset": "iwyu" } - ], - "workflowPresets": [ - { - "name": "iwyu", - "steps": [ - { - "type": "configure", - "name": "iwyu" - }, - { - "type": "build", - "name": "iwyu" - } - ] - } ] } diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ca13e1b956..91f2ff64dc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -253,7 +253,8 @@ For managing includes in C files, use [include-what-you-use]. - [Install include-what-you-use][include-what-you-use-install] - To see which includes needs fixing use the cmake preset `iwyu`: ``` - cmake --workflow --preset iwyu + cmake --preset iwyu + cmake --build --preset iwyu ``` - There's also a make target that automatically fixes the suggestions from IWYU: @@ -137,7 +137,8 @@ generated-sources benchmark uninstall $(FORMAT) $(LINT) $(TEST): | build/.ran-cm test: $(TEST) iwyu: build/.ran-cmake - cmake --workflow --fresh --preset iwyu > build/iwyu.log + cmake --preset iwyu + cmake --build --preset iwyu > build/iwyu.log iwyu-fix-includes --only_re="src/nvim" --ignore_re="src/nvim/(auto|map.h|eval/encode.c)" --safe_headers < build/iwyu.log cmake -B build -U ENABLE_IWYU |