[UPDATE] Rename FindClang* scripts to not conflict with mrt_cmake_mod…

…ules.
uulm-mrm · Aug 14, 2020 · 40a06e4 · 40a06e4
1 parent a74bf6e
commit 40a06e4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -60,7 +60,7 @@ function(create_git_hook)
 
   list(APPEND CMAKE_MODULE_PATH ${GCF_DIR})
   if("clang-format" IN_LIST GCF_cpp_FORMATTERS_LIST)
-    find_package(ClangFormat REQUIRED)
+    find_package(ClangFormatCurrent REQUIRED)
   endif()
   if("cmake-format" IN_LIST GCF_cmake_FORMATTERS_LIST)
     find_program(GCF_CMAKE_FORMAT_PATH cmake-format REQUIRED)
@@ -70,7 +70,7 @@ function(create_git_hook)
   endif()
 
   if("clang-tidy" IN_LIST GCF_cpp_LINTERS_LIST)
-    find_package(ClangTidy REQUIRED)
+    find_package(ClangTidyCurrent REQUIRED)
   endif()
   if("pylint" IN_LIST GCF_py_LINTERS_LIST)
     find_program(GCF_PYLINT_PATH pylint REQUIRED)

diff --git a/FindClangFormat.cmake → FindClangFormatCurrent.cmake b/FindClangFormat.cmake → FindClangFormatCurrent.cmake
diff --git a/FindClangTidy.cmake → FindClangTidyCurrent.cmake b/FindClangTidy.cmake → FindClangTidyCurrent.cmake