Skip to content

Commit bf7e78c

Browse files
committed
Merge branch 'rename-config-files-as-json-files' into alternate-main
2 parents b670976 + 3acd087 commit bf7e78c

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

cmake/common/clang-tidy.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ function(sourcemeta_clang_tidy_attempt_enable)
9898
NO_DEFAULT_PATH
9999
PATHS "${PROJECT_BINARY_DIR}/bin"
100100
REQUIRED)
101-
set(CLANG_TIDY_CONFIG "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/clang-tidy.config")
101+
102+
set(CLANG_TIDY_CONFIG "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/clang-tidy.json")
102103
execute_process(COMMAND xcrun --show-sdk-path
103104
OUTPUT_VARIABLE MACOSX_SDK_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
104105
execute_process(COMMAND "${CMAKE_CXX_COMPILER}" -print-resource-dir
File renamed without changes.

cmake/common/targets/clang-format.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ function(sourcemeta_target_clang_format)
101101
file(GLOB_RECURSE SOURCEMETA_TARGET_CLANG_FORMAT_FILES
102102
${SOURCEMETA_TARGET_CLANG_FORMAT_SOURCES})
103103

104-
set(CLANG_FORMAT_CONFIG "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/clang-format.config")
104+
set(CLANG_FORMAT_CONFIG "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/clang-format.json")
105105
if(CMAKE_SYSTEM_NAME STREQUAL "MSYS")
106106
# Because `clang-format` is typically a Windows `.exe`, transform the path accordingly
107107
execute_process(COMMAND cygpath -w "${CLANG_FORMAT_CONFIG}"

cmake/common/targets/clang-format.config

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"BasedOnStyle": "LLVM",
3+
"IndentCaseLabels": true
4+
}

0 commit comments

Comments
 (0)