Skip to content

Don't warn on missing clang-format/tidy when disabled #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
isaacbrodsky merged 1 commit into from
Jul 19, 2026
Merged

Don't warn on missing clang-format/tidy when disabled #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ The public API of this library consists of the functions declared in file
## [Unreleased]
### Fixed
- Fixed the `polygonToCells` fuzzer regression test to use explicit double literals instead of reinterpreting raw bytes, so it is portable across endianness (#964)
- No longer emit a CMake warning about a missing `clang-format`/`clang-tidy` when the user explicitly set `ENABLE_FORMAT=OFF`/`ENABLE_LINTING=OFF` (#1158)

## [4.5.0] - 2026-05-21
### Added
Expand Down
19 changes: 16 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,14 @@ add_h3_library(h3 "")

# Automatic code formatting Give preference to clang-format-14
find_program(CLANG_FORMAT_PATH NAMES clang-format-14 clang-format)
# Warn about a missing clang-format only if the user did not disable formatting
# themselves. Must be checked before cmake_dependent_option overrides
# ENABLE_FORMAT when clang-format is not found.
if(DEFINED ENABLE_FORMAT AND NOT ENABLE_FORMAT)
set(format_explicitly_disabled TRUE)
else()
set(format_explicitly_disabled FALSE)
endif()
cmake_dependent_option(
ENABLE_FORMAT "Enable running clang-format before compiling" ON
"CLANG_FORMAT_PATH" OFF)
Expand All @@ -438,19 +446,24 @@ if(ENABLE_FORMAT)
COMMENT "Formatting sources")
# Always do formatting
add_dependencies(h3 format)
elseif(NOT CLANG_FORMAT_PATH)
elseif(NOT CLANG_FORMAT_PATH AND NOT format_explicitly_disabled)
message(WARNING "clang-format was not detected, "
"so automatic source code reformatting is disabled")
endif()

option(ENABLE_LINTING "Run clang-tidy on source files" ON)
find_program(CLANG_TIDY_PATH "clang-tidy")
# Same as above: only warn when linting was not disabled by the user
if(DEFINED ENABLE_LINTING AND NOT ENABLE_LINTING)
set(linting_explicitly_disabled TRUE)
else()
set(linting_explicitly_disabled FALSE)
endif()
cmake_dependent_option(
ENABLE_LINTING "Enable running clang-tidy on sources during compilation" ON
"CLANG_TIDY_PATH" OFF)
if(ENABLE_LINTING)
set_target_properties(h3 PROPERTIES C_CLANG_TIDY "${CLANG_TIDY_PATH}")
elseif(NOT CLANG_TIDY_PATH)
elseif(NOT CLANG_TIDY_PATH AND NOT linting_explicitly_disabled)
message(WARNING "clang-tidy was not detected, "
"so source code linting is disabled")
endif()
Expand Down
Loading