From 2a03d4161cf44ebed3e4ef89a748d9b804ad53f9 Mon Sep 17 00:00:00 2001 From: Balakrishna Avulapati Date: Mon, 21 Jul 2025 18:32:11 +0530 Subject: [PATCH 1/5] Use json file format Signed-off-by: Balakrishna Avulapati --- cmake/common/clang-tidy.cmake | 11 ++++++----- cmake/common/clang-tidy.json | 6 ++++++ cmake/common/targets/clang-format.cmake | 2 +- cmake/common/targets/clang-format.config | 3 --- cmake/common/targets/clang-format.json | 4 ++++ 5 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 cmake/common/clang-tidy.json delete mode 100644 cmake/common/targets/clang-format.config create mode 100644 cmake/common/targets/clang-format.json diff --git a/cmake/common/clang-tidy.cmake b/cmake/common/clang-tidy.cmake index 025251e37..2a4ac41e1 100644 --- a/cmake/common/clang-tidy.cmake +++ b/cmake/common/clang-tidy.cmake @@ -98,18 +98,19 @@ 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") - execute_process(COMMAND xcrun --show-sdk-path + endif() + + 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 + execute_process(COMMAND "${CMAKE_CXX_COMPILER}" -print-resource-dir OUTPUT_VARIABLE MACOSX_RESOURCE_PATH OUTPUT_STRIP_TRAILING_WHITESPACE) - set(SOURCEMETA_CXX_CLANG_TIDY + set(SOURCEMETA_CXX_CLANG_TIDY "${CLANG_TIDY_BIN};--config-file=${CLANG_TIDY_CONFIG};-header-filter=${PROJECT_SOURCE_DIR}/src/*" "--extra-arg=-isysroot" "--extra-arg=${MACOSX_SDK_PATH}" "--extra-arg=-resource-dir=${MACOSX_RESOURCE_PATH}" CACHE STRING "CXX_CLANG_TIDY") - endif() set_target_properties("${SOURCEMETA_TARGET_CLANG_TIDY_ATTEMPT_ENABLE_TARGET}" PROPERTIES CXX_CLANG_TIDY "${SOURCEMETA_CXX_CLANG_TIDY}") diff --git a/cmake/common/clang-tidy.json b/cmake/common/clang-tidy.json new file mode 100644 index 000000000..9be7d5830 --- /dev/null +++ b/cmake/common/clang-tidy.json @@ -0,0 +1,6 @@ +{ + "Checks": "-*, concurrency-*, modernize-*, portability-*", + "WarningsAsErrors": "*", + "FormatStyle": "none", + "UseColor": true +} 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 +} From 333c824e925d467e89080bc0cdeccb480f9f598f Mon Sep 17 00:00:00 2001 From: Balakrishna Avulapati Date: Tue, 22 Jul 2025 01:51:38 +0530 Subject: [PATCH 2/5] remove performance-* Signed-off-by: Balakrishna Avulapati --- cmake/common/clang-tidy.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/common/clang-tidy.config b/cmake/common/clang-tidy.config index c69b9009c..9be7d5830 100644 --- a/cmake/common/clang-tidy.config +++ b/cmake/common/clang-tidy.config @@ -1,5 +1,5 @@ { - "Checks": "-*, concurrency-*, modernize-*, performance-*, portability-*", + "Checks": "-*, concurrency-*, modernize-*, portability-*", "WarningsAsErrors": "*", "FormatStyle": "none", "UseColor": true From 773e2f52da86194cd1e57ae5025581a95516e61d Mon Sep 17 00:00:00 2001 From: Balakrishna Avulapati Date: Tue, 22 Jul 2025 02:06:06 +0530 Subject: [PATCH 3/5] remove irrelevant changes Signed-off-by: Balakrishna Avulapati --- cmake/common/clang-tidy.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/common/clang-tidy.cmake b/cmake/common/clang-tidy.cmake index 2a4ac41e1..7967f1044 100644 --- a/cmake/common/clang-tidy.cmake +++ b/cmake/common/clang-tidy.cmake @@ -98,19 +98,19 @@ function(sourcemeta_clang_tidy_attempt_enable) NO_DEFAULT_PATH PATHS "${PROJECT_BINARY_DIR}/bin" REQUIRED) - endif() - set(CLANG_TIDY_CONFIG "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/clang-tidy.json") - execute_process(COMMAND xcrun --show-sdk-path + 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 + execute_process(COMMAND "${CMAKE_CXX_COMPILER}" -print-resource-dir OUTPUT_VARIABLE MACOSX_RESOURCE_PATH OUTPUT_STRIP_TRAILING_WHITESPACE) - set(SOURCEMETA_CXX_CLANG_TIDY + set(SOURCEMETA_CXX_CLANG_TIDY "${CLANG_TIDY_BIN};--config-file=${CLANG_TIDY_CONFIG};-header-filter=${PROJECT_SOURCE_DIR}/src/*" "--extra-arg=-isysroot" "--extra-arg=${MACOSX_SDK_PATH}" "--extra-arg=-resource-dir=${MACOSX_RESOURCE_PATH}" CACHE STRING "CXX_CLANG_TIDY") + endif() set_target_properties("${SOURCEMETA_TARGET_CLANG_TIDY_ATTEMPT_ENABLE_TARGET}" PROPERTIES CXX_CLANG_TIDY "${SOURCEMETA_CXX_CLANG_TIDY}") From fe14e7dc29084f9f5b04155233f51d0358c788e5 Mon Sep 17 00:00:00 2001 From: Balakrishna Avulapati Date: Tue, 22 Jul 2025 02:08:17 +0530 Subject: [PATCH 4/5] remove .config file Signed-off-by: Balakrishna Avulapati --- cmake/common/clang-tidy.config | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 cmake/common/clang-tidy.config diff --git a/cmake/common/clang-tidy.config b/cmake/common/clang-tidy.config deleted file mode 100644 index 9be7d5830..000000000 --- a/cmake/common/clang-tidy.config +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Checks": "-*, concurrency-*, modernize-*, portability-*", - "WarningsAsErrors": "*", - "FormatStyle": "none", - "UseColor": true -} From 3acd087d032bd37da883ef6ecd6658fcd7dff205 Mon Sep 17 00:00:00 2001 From: Balakrishna Avulapati Date: Tue, 22 Jul 2025 02:28:28 +0530 Subject: [PATCH 5/5] add performance-* back Signed-off-by: Balakrishna Avulapati --- cmake/common/clang-tidy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/common/clang-tidy.json b/cmake/common/clang-tidy.json index 9be7d5830..c69b9009c 100644 --- a/cmake/common/clang-tidy.json +++ b/cmake/common/clang-tidy.json @@ -1,5 +1,5 @@ { - "Checks": "-*, concurrency-*, modernize-*, portability-*", + "Checks": "-*, concurrency-*, modernize-*, performance-*, portability-*", "WarningsAsErrors": "*", "FormatStyle": "none", "UseColor": true