diff --git a/cmake/common/clang-tidy.cmake b/cmake/common/clang-tidy.cmake index 025251e37..7967f1044 100644 --- a/cmake/common/clang-tidy.cmake +++ b/cmake/common/clang-tidy.cmake @@ -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 diff --git a/cmake/common/clang-tidy.config b/cmake/common/clang-tidy.json similarity index 100% rename from cmake/common/clang-tidy.config rename to cmake/common/clang-tidy.json diff --git a/cmake/common/targets/clang-format.cmake b/cmake/common/targets/clang-format.cmake index 55fbb6cdc..7868fceb0 100644 --- a/cmake/common/targets/clang-format.cmake +++ b/cmake/common/targets/clang-format.cmake @@ -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}" diff --git a/cmake/common/targets/clang-format.config b/cmake/common/targets/clang-format.config deleted file mode 100644 index d9c695cc9..000000000 --- a/cmake/common/targets/clang-format.config +++ /dev/null @@ -1,3 +0,0 @@ ---- -BasedOnStyle: LLVM -IndentCaseLabels: true diff --git a/cmake/common/targets/clang-format.json b/cmake/common/targets/clang-format.json new file mode 100644 index 000000000..7e760c01e --- /dev/null +++ b/cmake/common/targets/clang-format.json @@ -0,0 +1,4 @@ +{ + "BasedOnStyle": "LLVM", + "IndentCaseLabels": true +}