From 478cabae1abb4d7ca9425ebffba7d085ec76ef2b Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Sat, 7 Mar 2020 15:39:09 +0100 Subject: [PATCH] CMAKE: apply checks on own sources only moved into src/ dir to skip the validation of contrib/libs (external deps) --- CMakeLists.txt | 26 -------------------------- src/CMakeLists.txt | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d428aff74..ee07c144b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -189,32 +189,6 @@ else() message(STATUS "ccache not found") endif() -if (USE_LINK_WHAT_YOU_USE) - set(CMAKE_LINK_WHAT_YOU_USE ON) -endif() - -if (USE_CLANG_TIDY) - find_host_program(CLANG_TIDY_EXECUTABLE NAMES clang-tidy clang-tidy-3.8) - if (CLANG_TIDY_EXECUTABLE) - set(CLANG_TIDY_OPTS ${CLANG_TIDY_EXECUTABLE}) - set(CMAKE_C_CLANG_TIDY "${CLANG_TIDY_OPTS}") - set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_OPTS}") - endif() -endif() - -if (USE_CPPCHECK) -find_host_program(CMAKE_CXX_CPPCHECK NAMES cppcheck) -list(APPEND CMAKE_CXX_CPPCHECK - "--enable=all" - "--inconclusive" - "--force" - "--inline-suppr" - "--suppressions-list=${SCRIPTS_CMAKE_DIR}/CppCheckSuppressions.txt" -) -else() -set(CMAKE_CXX_CPPCHECK "") -endif() - find_host_program(GDB_EXECUTABLE NAMES ${GDB_BINARY} gdb) find_host_program(LLDB_EXECUTABLE NAMES ${LLDB_BINARY} lldb) find_host_program(GIT_EXECUTABLE NAMES ${GIT_BINARY} git) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2a72f7096..daee53c9f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,3 +1,30 @@ +if (USE_LINK_WHAT_YOU_USE) + set(CMAKE_LINK_WHAT_YOU_USE ON) +endif() + +if (USE_CLANG_TIDY) +find_host_program(CLANG_TIDY_EXECUTABLE NAMES clang-tidy clang-tidy-3.8 clang-tidy-8 clang-tidy-9 clang-tidy-10 clang-tidy-11) +if (CLANG_TIDY_EXECUTABLE) + set(CMAKE_CXX_CLANG_TIDY + ${CLANG_TIDY_EXECUTABLE}; + -fix; + -checks=-checks=performance-*,cppcoreguidelines-*,-cppcoreguidelines-pro-type-vararg,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-type-union-access,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-narrowing-conversions,bugprone-*,-bugprone-narrowing-conversions,-bugprone-exception-escape,portability-*,clang-analyzer-*,readability-*,-readability-uppercase-literal-suffix,-readability-isolate-declaration,-readability-braces-around-statements,-readability-magic-numbers,modernize-*,-modernize-use-trailing-return-type,misc-*;) +endif() +endif() + +if (USE_CPPCHECK) +find_host_program(CMAKE_CXX_CPPCHECK NAMES cppcheck) +list(APPEND CMAKE_CXX_CPPCHECK + "--enable=all" + "--inconclusive" + "--force" + "--inline-suppr" + "--suppressions-list=${SCRIPTS_CMAKE_DIR}/CppCheckSuppressions.txt" +) +else() +set(CMAKE_CXX_CPPCHECK "") +endif() + add_subdirectory(modules) if (CLIENT) add_subdirectory(client)