From 016ebf7b9b7563fb2bef300d1b3c96fed5edb120 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Mon, 30 Sep 2024 23:43:29 -0700 Subject: [PATCH] cmake: only run prettier explicitly (#14228) --- CMakeLists.txt | 5 ++++- cmake/Options.cmake | 2 ++ package.json | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fe5cf20c1..c3daa3702a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,4 +46,7 @@ include(BuildBun) include(RunClangFormat) include(RunClangTidy) include(RunZigFormat) -include(RunPrettier) + +if (ENABLE_PRETTIER) + include(RunPrettier) +endif() diff --git a/cmake/Options.cmake b/cmake/Options.cmake index 44ea99042d..66803d5fcd 100644 --- a/cmake/Options.cmake +++ b/cmake/Options.cmake @@ -91,6 +91,8 @@ if(LINUX) optionx(ENABLE_VALGRIND BOOL "If Valgrind support should be enabled" DEFAULT OFF) endif() +optionx(ENABLE_PRETTIER BOOL "If prettier should be ran" DEFAULT OFF) + if(USE_VALGRIND AND NOT USE_BASELINE) message(WARNING "If valgrind is enabled, baseline must also be enabled") setx(USE_BASELINE ON) diff --git a/package.json b/package.json index cc8766480b..6f9c56e1ff 100644 --- a/package.json +++ b/package.json @@ -68,9 +68,9 @@ "zig-format": "bun run cmake --target zig-format", "zig-format:check": "bun run cmake --target zig-format-check", "zig-format:diff": "bun run cmake --target zig-format-diff", - "prettier": "bun run cmake --target prettier", - "prettier:check": "bun run cmake --target prettier-check", - "prettier:extra": "bun run cmake --target prettier-extra", - "prettier:diff": "bun run cmake --target prettier-diff" + "prettier": "bun run cmake -DENABLE_PRETTIER=ON --target prettier", + "prettier:check": "bun run cmake -DENABLE_PRETTIER=ON --target prettier-check", + "prettier:extra": "bun run cmake -DENABLE_PRETTIER=ON --target prettier-extra", + "prettier:diff": "bun run cmake -DENABLE_PRETTIER=ON --target prettier-diff" } }