Merge pull request redpanda-data#15344 from dotnwat/clang-tidy

clang-tidy: tweak find_program hints
abhijat · Dec 6, 2023 · f9565f4 · f9565f4
2 parents 4e820ca + 6d9236c
commit f9565f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -57,12 +57,9 @@ set(Redpanda_ENABLE_CLANG_TIDY "ON" CACHE STRING
 
 if(NOT Redpanda_ENABLE_CLANG_TIDY STREQUAL OFF)
   if(Redpanda_ENABLE_CLANG_TIDY STREQUAL FORCE_ON)
-    find_program(CLANG_TIDY_COMMAND clang-tidy
-      PATHS ${PROJECT_SOURCE_DIR}/vbuild/llvm/install/bin
-      REQUIRED)
+    find_program(CLANG_TIDY_COMMAND clang-tidy REQUIRED)
   else()
-    find_program(CLANG_TIDY_COMMAND clang-tidy
-      PATHS ${PROJECT_SOURCE_DIR}/vbuild/llvm/install/bin)
+    find_program(CLANG_TIDY_COMMAND clang-tidy)
   endif()
   if(CLANG_TIDY_COMMAND)
     set(Redpanda_ENABLE_CLANG_TIDY ON)

diff --git a/src/v/CMakeLists.txt b/src/v/CMakeLists.txt
@@ -10,7 +10,7 @@ add_compile_options(-Wall)
 option(REDPANDA_RUN_CLANG_TIDY "Enable clang-tidy checks" OFF)
 if(REDPANDA_RUN_CLANG_TIDY)
     find_program(CLANG_TIDY_COMMAND clang-tidy
-        PATHS ${PROJECT_SOURCE_DIR}/vbuild/llvm/install/bin)
+        HINTS ${PROJECT_SOURCE_DIR}/vbuild/llvm/install/bin)
     if(NOT CLANG_TIDY_COMMAND)
         message(FATAL_ERROR "Could not find clang-tidy program")
     endif()