Skip to content

Use json file format #1859

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
merged 5 commits into from
Jul 22, 2025
Merged

Use json file format #1859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a03d41
Use json file format
bavulapati Jul 21, 2025
333c824
remove performance-*
bavulapati Jul 21, 2025
773e2f5
remove irrelevant changes
bavulapati Jul 21, 2025
fe14e7d
remove .config file
bavulapati Jul 21, 2025
3acd087
add performance-* back
bavulapati Jul 21, 2025
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
3 changes: 2 additions & 1 deletion cmake/common/clang-tidy.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ function(sourcemeta_clang_tidy_attempt_enable)
NO_DEFAULT_PATH
PATHS "${PROJECT_BINARY_DIR}/bin"
REQUIRED)
set(CLANG_TIDY_CONFIG "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/clang-tidy.config")

set(CLANG_TIDY_CONFIG "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/clang-tidy.json")
execute_process(COMMAND xcrun --show-sdk-path
OUTPUT_VARIABLE MACOSX_SDK_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND "${CMAKE_CXX_COMPILER}" -print-resource-dir
Expand Down
0 cmake/common/clang-tidy.config → cmake/common/clang-tidy.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cmake/common/targets/clang-format.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ function(sourcemeta_target_clang_format)
file(GLOB_RECURSE SOURCEMETA_TARGET_CLANG_FORMAT_FILES
${SOURCEMETA_TARGET_CLANG_FORMAT_SOURCES})

set(CLANG_FORMAT_CONFIG "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/clang-format.config")
set(CLANG_FORMAT_CONFIG "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/clang-format.json")
if(CMAKE_SYSTEM_NAME STREQUAL "MSYS")
# Because `clang-format` is typically a Windows `.exe`, transform the path accordingly
execute_process(COMMAND cygpath -w "${CLANG_FORMAT_CONFIG}"
Expand Down
3 changes: 0 additions & 3 deletions cmake/common/targets/clang-format.config
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions cmake/common/targets/clang-format.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"BasedOnStyle": "LLVM",
"IndentCaseLabels": true
}
Loading