From 5abf2b22bda515b3d96265f7f70db0bcd7ced7cf Mon Sep 17 00:00:00 2001 From: apBUS_amp_K Date: Mon, 25 May 2026 16:11:56 +0300 Subject: [PATCH 01/11] Added COLA_FETCH_MODE to bypass install --- CMakeLists.txt | 109 ++++++++++++++++++++++++++----------------------- 1 file changed, 57 insertions(+), 52 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 26766d5..05bf0e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,56 +54,61 @@ set_target_properties( CXX_CLANG_TIDY "${COLA_CMAKE_CXX_CLANG_TIDY}" ) -include(GNUInstallDirs) -include(CMakePackageConfigHelpers) - -install( - TARGETS COLA - EXPORT COLAExport - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - INCLUDES - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -) - -configure_package_config_file( - "${PROJECT_SOURCE_DIR}/data/COLAConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/COLAConfig.cmake" - INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/COLA -) - -write_basic_package_version_file( - ${CMAKE_CURRENT_BINARY_DIR}/COLAConfigVersion.cmake COMPATIBILITY AnyNewerVersion -) - -install(EXPORT COLAExport DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/COLA) - -# install( -# DIRECTORY ${PROJECT_SOURCE_DIR}/COLA -# DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -# FILES_MATCHING -# PATTERN "*.hh" -# ) - -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/COLAConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/COLAConfigVersion.cmake" - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/COLA -) - -install(FILES "${PROJECT_SOURCE_DIR}/data/config.sh" - DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR} -) - -install( - DIRECTORY cmake/ - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/COLA/cmake - FILES_MATCHING - PATTERN "*.cmake" -) - -enable_testing() -if (BUILD_TESTING) - add_subdirectory(tests) +# Check for COLA_FETCH_MODE to prevent install instructions from generating +if (NOT COLA_FETCH_MODE) + + include(GNUInstallDirs) + include(CMakePackageConfigHelpers) + + install( + TARGETS COLA + EXPORT COLAExport + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + INCLUDES + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) + + configure_package_config_file( + "${PROJECT_SOURCE_DIR}/data/COLAConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/COLAConfig.cmake" + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/COLA + ) + + write_basic_package_version_file( + ${CMAKE_CURRENT_BINARY_DIR}/COLAConfigVersion.cmake COMPATIBILITY AnyNewerVersion + ) + + install(EXPORT COLAExport DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/COLA) + + # install( + # DIRECTORY ${PROJECT_SOURCE_DIR}/COLA + # DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + # FILES_MATCHING + # PATTERN "*.hh" + # ) + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/COLAConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/COLAConfigVersion.cmake" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/COLA + ) + + install(FILES "${PROJECT_SOURCE_DIR}/data/config.sh" + DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR} + ) + + install( + DIRECTORY cmake/ + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/COLA/cmake + FILES_MATCHING + PATTERN "*.cmake" + ) + + enable_testing() + if (BUILD_TESTING) + add_subdirectory(tests) + endif () + + include(cmake/COLAQualityTools.cmake) + setup_cola_quality_tools(EXCLUDE_PATTERNS ".*/tinyxml2/.*") endif () - -include(cmake/COLAQualityTools.cmake) -setup_cola_quality_tools(EXCLUDE_PATTERNS ".*/tinyxml2/.*") From 7f4be9891f489587e80d548ca23ccfa33d09e6bd Mon Sep 17 00:00:00 2001 From: apBUS_amp_K Date: Tue, 26 May 2026 10:20:26 +0300 Subject: [PATCH 02/11] Changed COLA_FETCH_MODE variable to environmental --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 05bf0e6..05a3477 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ set_target_properties( ) # Check for COLA_FETCH_MODE to prevent install instructions from generating -if (NOT COLA_FETCH_MODE) +if (NOT $ENV{COLA_FETCH_MODE}) include(GNUInstallDirs) include(CMakePackageConfigHelpers) From 3e4245002e51e370abd63b604e5295c22a3157d0 Mon Sep 17 00:00:00 2001 From: apBUS_amp_K Date: Wed, 27 May 2026 07:01:33 +0300 Subject: [PATCH 03/11] fixes for CRoot --- CMakeLists.txt | 2 +- data/COLAConfig.cmake.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 05a3477..c3ff652 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ set_target_properties( ) # Check for COLA_FETCH_MODE to prevent install instructions from generating -if (NOT $ENV{COLA_FETCH_MODE}) +if (NOT DEFINED $ENV{COLA_FETCH_MODE}) include(GNUInstallDirs) include(CMakePackageConfigHelpers) diff --git a/data/COLAConfig.cmake.in b/data/COLAConfig.cmake.in index 886d9a3..ada4159 100644 --- a/data/COLAConfig.cmake.in +++ b/data/COLAConfig.cmake.in @@ -4,3 +4,4 @@ include(@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/cmake/COLA/COLAExport.cmak include(@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATAROOTDIR@/COLA/cmake/COLAQualityTools.cmake) set_and_check(COLA_DIR @CMAKE_INSTALL_PREFIX@) +set_and_check(COLA_EVENT_DATA @CMAKE_INNSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/EventData.hh) \ No newline at end of file From 17e00e323e94389f2eeaeca285c8b8488438d7a8 Mon Sep 17 00:00:00 2001 From: apBUS_amp_K Date: Wed, 27 May 2026 07:17:40 +0300 Subject: [PATCH 04/11] install fix --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c3ff652..d7312a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ set_target_properties( ) # Check for COLA_FETCH_MODE to prevent install instructions from generating -if (NOT DEFINED $ENV{COLA_FETCH_MODE}) +if (NOT DEFINED ENV{COLA_FETCH_MODE}) include(GNUInstallDirs) include(CMakePackageConfigHelpers) From c76e47c596b0d827daf1eb0a14336be1b7c88206 Mon Sep 17 00:00:00 2001 From: apBUS_amp_K Date: Wed, 27 May 2026 08:32:12 +0300 Subject: [PATCH 05/11] typo --- data/COLAConfig.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/COLAConfig.cmake.in b/data/COLAConfig.cmake.in index ada4159..2ffef3f 100644 --- a/data/COLAConfig.cmake.in +++ b/data/COLAConfig.cmake.in @@ -4,4 +4,4 @@ include(@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/cmake/COLA/COLAExport.cmak include(@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATAROOTDIR@/COLA/cmake/COLAQualityTools.cmake) set_and_check(COLA_DIR @CMAKE_INSTALL_PREFIX@) -set_and_check(COLA_EVENT_DATA @CMAKE_INNSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/EventData.hh) \ No newline at end of file +set_and_check(COLA_EVENT_DATA @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/EventData.hh) From 5bab8e5485dc93025feec8fe84f13df70bdc5cec Mon Sep 17 00:00:00 2001 From: Savva Savenkov <67229061+apBUSampK@users.noreply.github.com> Date: Wed, 27 May 2026 09:06:54 +0300 Subject: [PATCH 06/11] Updated README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b9d71d6..74dabe8 100644 --- a/README.md +++ b/README.md @@ -34,4 +34,4 @@ Generated documentation will be located in the ```docs/compiled/``` folder. ## COLA Modules -Currently there is only a [minimal module + program example](https://github.com/apBUSampK/COLA-min-example) with some guidelines on module writing. +Currently there is a [minimal module + program example](https://github.com/apBUSampK/COLA-min-example) with some guidelines on module writing, as well as [AAMCC-COLA](https://github.com/Spectator-matter-group-INR-RAS/AAMCC-COLA), a COLA implementation of AAMCC-MST model, along with relevant modules. From 79952069a126ee7f8c5a0206911b43d0891d3b90 Mon Sep 17 00:00:00 2001 From: apBUS_amp_K Date: Thu, 9 Jul 2026 14:24:23 +0300 Subject: [PATCH 07/11] CI + CMake fixes --- .github/workflows/ci.yml | 6 ++--- CMakeLists.txt | 6 ----- CMakePresets.json | 46 ++++++++++++++++++++---------------- COLA/LorentzVector.hh | 3 ++- cmake/COLAQualityTools.cmake | 2 +- 5 files changed, 32 insertions(+), 31 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c00ed7f..cb74b96 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,13 +24,13 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Install dependencies (Ubuntu) if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update - sudo apt-get install -y build-essential cmake libgtest-dev g++ clang-format-19 + sudo apt-get install -y build-essential cmake libgtest-dev g++ clang-format-20 pip install cmake-format - name: Install dependencies (macOS) @@ -53,4 +53,4 @@ jobs: id: check-format if: always() && matrix.os == 'ubuntu-latest' run: | - cmake --workflow check-format + cmake --workflow format-check diff --git a/CMakeLists.txt b/CMakeLists.txt index d7312a0..eafa99a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,11 +38,6 @@ target_include_directories( target_link_libraries(COLA PRIVATE tinyxml2) -set(COLA_CMAKE_CXX_CLANG_TIDY - "" - CACHE STRING "variable will be passed to CMAKE_CXX_CLANG_TIDY of COLA target" -) - # Public headers for proper target installation set(COLA_PUBLIC_HEADERS "COLA.hh" "COLA/EventData.hh" "COLA/LorentzVector.hh") @@ -51,7 +46,6 @@ set_target_properties( PROPERTIES PUBLIC_HEADER "${COLA_PUBLIC_HEADERS}" VERSION "${COLA_VERSION}" SOVERSION "${COLA_VERSION_MAJOR}" - CXX_CLANG_TIDY "${COLA_CMAKE_CXX_CLANG_TIDY}" ) # Check for COLA_FETCH_MODE to prevent install instructions from generating diff --git a/CMakePresets.json b/CMakePresets.json index d16c4d1..77f498e 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -51,17 +51,7 @@ "displayName": "Clang-tidy", "inherits": "default", "cacheVariables": { - "BUILD_TESTING": "ON", - "COLA_CMAKE_CXX_CLANG_TIDY": "clang-tidy" - } - }, - { - "name": "tidy-fix", - "displayName": "Clang-tidy fix", - "inherits": "default", - "cacheVariables": { - "BUILD_TESTING": "ON", - "COLA_CMAKE_CXX_CLANG_TIDY": "clang-tidy;--fix" + "BUILD_TESTING": "ON" } } ], @@ -84,12 +74,14 @@ { "name": "tidy", "displayName": "Tidy Build", - "configurePreset": "tidy" + "configurePreset": "tidy", + "targets": ["clang-tidy-check"] }, { "name": "tidy-fix", "displayName": "Tidy fix Build", - "configurePreset": "tidy-fix" + "configurePreset": "tidy", + "targets": ["clang-tidy-fix"] }, { "name": "clang-format-check", @@ -116,7 +108,7 @@ "targets": ["cmake-format-fix"] }, { - "name": "check-format", + "name": "format-check", "displayName": "Check all linters", "configurePreset": "tidy", "targets": [ @@ -125,13 +117,27 @@ ] }, { - "name": "fix-format", + "name": "format-fix", "displayName": "Fix all linters", "configurePreset": "tidy", "targets": [ "clang-format-fix", "cmake-format-fix" ] + }, + { + "name": "default-install", + "displayName": "Install the default configuration", + "configurePreset": "default", + "inherits": "default", + "targets": ["install"] + }, + { + "name": "release-install", + "displayName": "Install the release configuration", + "configurePreset": "release", + "inherits": "release", + "targets": ["install"] } ], "testPresets": [ @@ -169,7 +175,7 @@ }, { "name": "test", - "displayName": "Test Workflow (with linter checks)", + "displayName": "Test Workflow (with cnlang-tidy checks)", "steps": [ { "type": "configure", @@ -186,7 +192,7 @@ ] }, { - "name": "check-format", + "name": "format-check", "displayName": "Check All Linters Workflow", "steps": [ { @@ -195,12 +201,12 @@ }, { "type": "build", - "name": "check-format" + "name": "format-check" } ] }, { - "name": "fix-format", + "name": "format-fix", "displayName": "Fix All Linters Workflow", "steps": [ { @@ -209,7 +215,7 @@ }, { "type": "build", - "name": "fix-format" + "name": "format-fix" } ] }, diff --git a/COLA/LorentzVector.hh b/COLA/LorentzVector.hh index 2c5b389..c3fff2f 100644 --- a/COLA/LorentzVector.hh +++ b/COLA/LorentzVector.hh @@ -20,10 +20,11 @@ #ifndef COLA_LORENTZVECTOR_HH #define COLA_LORENTZVECTOR_HH +#include + #include #include #include -#include #include #include #include diff --git a/cmake/COLAQualityTools.cmake b/cmake/COLAQualityTools.cmake index fb058dd..29a687a 100644 --- a/cmake/COLAQualityTools.cmake +++ b/cmake/COLAQualityTools.cmake @@ -55,7 +55,7 @@ function (setup_cola_quality_tools) add_custom_target( clang-tidy-fix - COMMAND ${CLANG_TIDY_EXE} -p ${CMAKE_BINARY_DIR} -fix ${CPP_SOURCES} + COMMAND ${CLANG_TIDY_EXE} -p ${CMAKE_BINARY_DIR} --fix ${CPP_SOURCES} COMMENT "Run clang-tidy with fixes" ) message(STATUS "clang-tidy: ${CLANG_TIDY_EXE}") From 05fed64a4dee7bc460cea17413532b6c92ee8d03 Mon Sep 17 00:00:00 2001 From: apBUS_amp_K Date: Thu, 9 Jul 2026 15:11:56 +0300 Subject: [PATCH 08/11] CI tidy dependency --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb74b96..875361c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update - sudo apt-get install -y build-essential cmake libgtest-dev g++ clang-format-20 + sudo apt-get install -y build-essential cmake libgtest-dev g++ clang-format-20 clang-tidy-20 pip install cmake-format - name: Install dependencies (macOS) From fb5ae080bd1b36fdb93d1f466d282b53680fdcbe Mon Sep 17 00:00:00 2001 From: apBUS_amp_K Date: Thu, 9 Jul 2026 16:37:59 +0300 Subject: [PATCH 09/11] presets cleanup + moved clang-tidy to "Check formatting" ci step --- CMakePresets.json | 53 +++++++++++++++++++++++++------------------- tests/CMakeLists.txt | 1 - 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 77f498e..b422312 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -46,9 +46,9 @@ "BUILD_TESTING": "ON" } }, - { - "name": "tidy", - "displayName": "Clang-tidy", + { + "name": "default-test", + "displayName": "Default with Tests", "inherits": "default", "cacheVariables": { "BUILD_TESTING": "ON" @@ -71,58 +71,65 @@ "displayName": "Release Test Build", "configurePreset": "release-test" }, + { + "name": "default-test", + "displayName": "Default with Tests", + "configurePreset": "default-test" + }, { - "name": "tidy", - "displayName": "Tidy Build", - "configurePreset": "tidy", + "name": "clang-tidy-check", + "displayName": "Check clang-tidy", + "configurePreset": "default", "targets": ["clang-tidy-check"] }, { "name": "tidy-fix", - "displayName": "Tidy fix Build", - "configurePreset": "tidy", + "displayName": "Check and fix clang-tidy", + "configurePreset": "default", "targets": ["clang-tidy-fix"] }, { "name": "clang-format-check", "displayName": "Check clang-format", - "configurePreset": "tidy", + "configurePreset": "default", "targets": ["clang-format-check"] }, { "name": "clang-format-fix", "displayName": "Fix clang-format", - "configurePreset": "tidy", + "configurePreset": "default", "targets": ["clang-format-fix"] }, { "name": "cmake-format-check", "displayName": "Check cmake-format", - "configurePreset": "tidy", + "configurePreset": "default", "targets": ["cmake-format-check"] }, { "name": "cmake-format-fix", "displayName": "Fix cmake-format", - "configurePreset": "tidy", + "configurePreset": "default", "targets": ["cmake-format-fix"] }, { "name": "format-check", "displayName": "Check all linters", - "configurePreset": "tidy", + "configurePreset": "default", "targets": [ "clang-format-check", - "cmake-format-check" + "cmake-format-check", + "clang-tidy-check" ] }, { "name": "format-fix", "displayName": "Fix all linters", - "configurePreset": "tidy", + "configurePreset": "default", "targets": [ "clang-format-fix", - "cmake-format-fix" + "cmake-format-fix", + "clang-tidy-fix" ] }, { @@ -144,7 +151,7 @@ { "name": "default", "displayName": "Run Debug Tests", - "configurePreset": "tidy", + "configurePreset": "default-test", "output": { "outputOnFailure": true } @@ -174,16 +181,16 @@ ] }, { - "name": "test", - "displayName": "Test Workflow (with cnlang-tidy checks)", + "name": "default-test", + "displayName": "Test Workflow", "steps": [ { "type": "configure", - "name": "tidy" + "name": "default-test" }, { "type": "build", - "name": "tidy" + "name": "default-test" }, { "type": "test", @@ -197,7 +204,7 @@ "steps": [ { "type": "configure", - "name": "tidy" + "name": "default" }, { "type": "build", @@ -211,7 +218,7 @@ "steps": [ { "type": "configure", - "name": "tidy" + "name": "default" }, { "type": "build", diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a6deb02..06b5017 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -27,7 +27,6 @@ set_target_properties( PROPERTIES CXX_STANDARD 20 CXX_STANDARD_REQUIRED YES CXX_EXTENSIONS NO - CXX_CLANG_TIDY "${COLA_CMAKE_CXX_CLANG_TIDY}" BUILD_RPATH "${CMAKE_BINARY_DIR}" BUILD_WITH_INSTALL_RPATH FALSE ) From 8441a087ffd6309828452cd9fcb6244ac74102db Mon Sep 17 00:00:00 2001 From: apBUS_amp_K Date: Thu, 9 Jul 2026 16:47:28 +0300 Subject: [PATCH 10/11] Forgot to actually stage ci.yml --- .github/workflows/ci.yml | 6 ------ CMakePresets.json | 12 ++++++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 875361c..d279687 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,12 +43,6 @@ jobs: run: | cmake --workflow release-test - - name: Clang-tidy - id: clang-tidy - if: matrix.os == 'ubuntu-latest' - run: | - cmake --workflow test - - name: Check formatting id: check-format if: always() && matrix.os == 'ubuntu-latest' diff --git a/CMakePresets.json b/CMakePresets.json index b422312..d81629d 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -79,13 +79,13 @@ { "name": "clang-tidy-check", "displayName": "Check clang-tidy", - "configurePreset": "default", + "configurePreset": "default-test", "targets": ["clang-tidy-check"] }, { "name": "tidy-fix", "displayName": "Check and fix clang-tidy", - "configurePreset": "default", + "configurePreset": "default-test", "targets": ["clang-tidy-fix"] }, { @@ -115,7 +115,7 @@ { "name": "format-check", "displayName": "Check all linters", - "configurePreset": "default", + "configurePreset": "default-test", "targets": [ "clang-format-check", "cmake-format-check", @@ -125,7 +125,7 @@ { "name": "format-fix", "displayName": "Fix all linters", - "configurePreset": "default", + "configurePreset": "default-test", "targets": [ "clang-format-fix", "cmake-format-fix", @@ -204,7 +204,7 @@ "steps": [ { "type": "configure", - "name": "default" + "name": "default-test" }, { "type": "build", @@ -218,7 +218,7 @@ "steps": [ { "type": "configure", - "name": "default" + "name": "default-test" }, { "type": "build", From 9fb7488a164d10f538a14b2d0501b9c5ab2a908d Mon Sep 17 00:00:00 2001 From: apBUS_amp_K Date: Wed, 29 Jul 2026 15:12:20 +0300 Subject: [PATCH 11/11] clang tools change --- cmake/COLAQualityTools.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/COLAQualityTools.cmake b/cmake/COLAQualityTools.cmake index 29a687a..7624a1e 100644 --- a/cmake/COLAQualityTools.cmake +++ b/cmake/COLAQualityTools.cmake @@ -5,9 +5,9 @@ function (setup_cola_quality_tools) set(EXCLUDE_PATTERNS ${DEFAULT_EXCLUDE_PATTERNS} ${QUALITY_EXCLUDE_PATTERNS}) find_program( - CLANG_FORMAT_EXE NAMES clang-format-21 clang-format-20 clang-format-19 clang-format + CLANG_FORMAT_EXE NAMES clang-format clang-format-20 ) - find_program(CLANG_TIDY_EXE NAMES clang-tidy-21 clang-tidy-20 clang-tidy-19 clang-tidy) + find_program(CLANG_TIDY_EXE NAMES clang-tidy clang-tidy-20) find_program(CMAKE_FORMAT_EXE NAMES cmake-format) file(