Llewellyn
/
conky
mirror of https://github.com/Llewellynvdm/conky.git
1
0
Fork 0
Code Issues Releases Activity

Rename cmake vars to suppress warnings.

This commit is contained in:
Brenden Matthews 2021-01-23 18:22:47 -06:00
parent 283129e283
commit 2e6b3bdb8e
No known key found for this signature in database
GPG Key ID: B49ABB7270D9D4FD
4 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/FindClangFormat.cmake
View File

@ -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)

10
cmake/FindClangTidy.cmake
View File

@ -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)

22
cmake/clang-format.cmake
View File

@ -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})

18
cmake/clang-tidy.cmake
View File

@ -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})