From 2e6b3bdb8e1f653ffb7c35102f20017e38ebec9c Mon Sep 17 00:00:00 2001
From: Brenden Matthews <brenden@brndn.io>
Date: Sat, 23 Jan 2021 18:22:47 -0600
Subject: [PATCH] Rename cmake vars to suppress warnings.

---
 cmake/FindClangFormat.cmake | 10 +++++-----
 cmake/FindClangTidy.cmake   | 10 +++++-----
 cmake/clang-format.cmake    | 22 +++++++++++-----------
 cmake/clang-tidy.cmake      | 18 +++++++++---------
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/cmake/FindClangFormat.cmake b/cmake/FindClangFormat.cmake
index 044db6b0..571fd142 100644
--- a/cmake/FindClangFormat.cmake
+++ b/cmake/FindClangFormat.cmake
@@ -1,21 +1,21 @@
 # Find Clang format
 #
 
-set(CLANG_FORMAT_BIN_NAME
+set(ClangFormat_BIN_NAME
     clang-format
     clang-format-5.0
     clang-format-6.0
     clang-format-7
     clang-format-8)
 
-find_program(CLANG_FORMAT_BIN NAMES ${CLANG_FORMAT_BIN_NAME})
+find_program(ClangFormat_BIN NAMES ${ClangFormat_BIN_NAME})
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CLANG_FORMAT DEFAULT_MSG CLANG_FORMAT_BIN)
+find_package_handle_standard_args(ClangFormat DEFAULT_MSG ClangFormat_BIN)
 
-mark_as_advanced(CLANG_FORMAT_BIN)
+mark_as_advanced(ClangFormat_BIN)
 
-if(CLANG_FORMAT_FOUND)
+if(ClangFormat_FOUND)
   # A CMake script to find all source files and setup clang-format targets for
   # them
   include(clang-format)
diff --git a/cmake/FindClangTidy.cmake b/cmake/FindClangTidy.cmake
index c44e3d2f..e182f4cd 100644
--- a/cmake/FindClangTidy.cmake
+++ b/cmake/FindClangTidy.cmake
@@ -1,21 +1,21 @@
 # Find Clang tidy
 #
 
-set(CLANG_TIDY_BIN_NAME
+set(ClangTidy_BIN_NAME
     clang-tidy
     clang-tidy-5.0
     clang-tidy-6.0
     clang-tidy-7
     clang-tidy-8)
 
-find_program(CLANG_TIDY_BIN NAMES ${CLANG_TIDY_BIN_NAME})
+find_program(ClangTidy_BIN NAMES ${ClangTidy_BIN_NAME})
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CLANG_TIDY DEFAULT_MSG CLANG_TIDY_BIN)
+find_package_handle_standard_args(ClangTidy DEFAULT_MSG ClangTidy_BIN)
 
-mark_as_advanced(CLANG_TIDY_BIN)
+mark_as_advanced(ClangTidy_BIN)
 
-if(CLANG_TIDY_FOUND)
+if(ClangTidy_FOUND)
   # A CMake script to find all source files and setup clang-tidy targets for
   # them
   include(clang-tidy)
diff --git a/cmake/clang-format.cmake b/cmake/clang-format.cmake
index 7fc6b1e8..abe8d991 100644
--- a/cmake/clang-format.cmake
+++ b/cmake/clang-format.cmake
@@ -1,5 +1,5 @@
-set(CLANG_FORMAT_CXX_FILE_EXTENSIONS
-    ${CLANG_FORMAT_CXX_FILE_EXTENSIONS}
+set(ClangFormat_CXX_FILE_EXTENSIONS
+    ${ClangFormat_CXX_FILE_EXTENSIONS}
     *.cpp
     *.h
     *.cxx
@@ -9,19 +9,19 @@ set(CLANG_FORMAT_CXX_FILE_EXTENSIONS
     *.hh
     *.ipp)
 
-foreach(PATTERN ${CLANG_FORMAT_CXX_FILE_EXTENSIONS})
-  list(APPEND CLANG_FORMAT_CXX_PATTERN ${CMAKE_SOURCE_DIR}/src/${PATTERN})
-  list(APPEND CLANG_FORMAT_CXX_PATTERN ${CMAKE_SOURCE_DIR}/tests/${PATTERN})
-  list(APPEND CLANG_FORMAT_CXX_PATTERN ${CMAKE_SOURCE_DIR}/lua/${PATTERN})
+foreach(PATTERN ${ClangFormat_CXX_FILE_EXTENSIONS})
+  list(APPEND ClangFormat_CXX_PATTERN ${CMAKE_SOURCE_DIR}/src/${PATTERN})
+  list(APPEND ClangFormat_CXX_PATTERN ${CMAKE_SOURCE_DIR}/tests/${PATTERN})
+  list(APPEND ClangFormat_CXX_PATTERN ${CMAKE_SOURCE_DIR}/lua/${PATTERN})
 endforeach()
 
-file(GLOB_RECURSE CLANG_FORMAT_SRCS ${CLANG_FORMAT_CXX_PATTERN})
+file(GLOB_RECURSE ClangFormat_SRCS ${ClangFormat_CXX_PATTERN})
 
 add_custom_target(clang-format
-                  COMMAND ${CLANG_FORMAT_BIN} -style=file -i
-                          ${CLANG_FORMAT_SRCS})
+                  COMMAND ${ClangFormat_BIN} -style=file -i
+                          ${ClangFormat_SRCS})
 add_custom_target(check-clang-format
                   COMMAND ${CMAKE_SOURCE_DIR}/bin/run-clang-format.py
                           --color always
-                          --clang-format-executable ${CLANG_FORMAT_BIN}
-                                                    ${CLANG_FORMAT_SRCS})
+                          --clang-format-executable ${ClangFormat_BIN}
+                                                    ${ClangFormat_SRCS})
diff --git a/cmake/clang-tidy.cmake b/cmake/clang-tidy.cmake
index bb94ba54..755ed67c 100644
--- a/cmake/clang-tidy.cmake
+++ b/cmake/clang-tidy.cmake
@@ -1,14 +1,14 @@
-get_target_property(CLANG_TIDY_SRCS_TMP conky SOURCES)
+get_target_property(ClangTidy_SRCS_TMP conky SOURCES)
 get_target_property(conky_SRC_DIR conky SOURCE_DIR)
 
 if(BUILD_TESTS)
-  get_target_property(CLANG_TIDY_SRCS_TMP_CORE conky_core SOURCES)
-  list(APPEND CLANG_TIDY_SRCS_TMP ${CLANG_TIDY_SRCS_TMP_CORE})
+  get_target_property(ClangTidy_SRCS_TMP_CORE conky_core SOURCES)
+  list(APPEND ClangTidy_SRCS_TMP ${ClangTidy_SRCS_TMP_CORE})
 endif()
 
-foreach(TMP_SRC ${CLANG_TIDY_SRCS_TMP})
+foreach(TMP_SRC ${ClangTidy_SRCS_TMP})
   if("${TMP_SRC}" MATCHES ".*\.cc|.*\.hh|.*\.[chi]pp|.*\.[chi]xx|.*\.ii")
-    list(APPEND CLANG_TIDY_SRCS ${conky_SRC_DIR}/${TMP_SRC})
+    list(APPEND ClangTidy_SRCS ${conky_SRC_DIR}/${TMP_SRC})
   endif()
 endforeach(TMP_SRC)
 
@@ -18,10 +18,10 @@ foreach(TMP_INCLUDE ${CLANG_INCLUDES_tmp})
 endforeach(TMP_INCLUDE)
 
 add_custom_target(clang-tidy
-                  COMMAND ${CLANG_TIDY_BIN} -config='' -fix -format-style=file
-                          ${CLANG_TIDY_SRCS}
+                  COMMAND ${ClangTidy_BIN} -config='' -fix -format-style=file
+                          ${ClangTidy_SRCS}
                           -- -std=c++17 -I${CMAKE_BINARY_DIR} ${CLANG_INCLUDES})
 add_custom_target(check-clang-tidy
-                  COMMAND ${CLANG_TIDY_BIN} -config='' -format-style=file
-                          ${CLANG_TIDY_SRCS}
+                  COMMAND ${ClangTidy_BIN} -config='' -format-style=file
+                          ${ClangTidy_SRCS}
                           -- -std=c++17 -I${CMAKE_BINARY_DIR} ${CLANG_INCLUDES})