From 1ddfa3e7ed84815d1d9568ca1d4140d6702ac2e0 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 10 Mar 2021 12:38:16 -0800 Subject: [PATCH] Moves clang-tidy arguments to root cmakelists This way we don't need to redeclare the arguments twice Also moves IWYU lower so it doesn't hit any external projects other than FEXCore Still not running these since everything needs to be cleaned up anyway --- CMakeLists.txt | 67 +++++++++++++++++++++++--- External/FEXCore/Source/CMakeLists.txt | 47 ------------------ Source/CMakeLists.txt | 48 ------------------ 3 files changed, 59 insertions(+), 103 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd6ae463f..fe8cff690 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,14 +27,6 @@ if (ENABLE_ASSERTIONS) add_definitions(-DASSERTIONS_ENABLED=1) endif() -if (ENABLE_IWYU) - find_program(IWYU_EXE "iwyu") - if (IWYU_EXE) - message(STATUS "IWYU enabled") - set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "${IWYU_EXE}") - endif() -endif() - set(CMAKE_CXX_STANDARD 20) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Bin) @@ -163,6 +155,65 @@ if(_M_ARM_64) endif() endif() +if (ENABLE_IWYU) + find_program(IWYU_EXE "iwyu") + if (IWYU_EXE) + message(STATUS "IWYU enabled") + set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "${IWYU_EXE}") + endif() +endif() + +if (ENABLE_CLANG_FORMAT) + find_program(CLANG_TIDY_EXE "clang-tidy") + if (NOT CLANG_TIDY_EXE) + message(FATAL_ERROR "Couldn't find clang-tidy") + endif() + + set(CLANG_TIDY_FLAGS + "-checks=*" + "-fuchsia*" + "-bugprone-macro-parentheses" + "-clang-analyzer-core.*" + "-cppcoreguidelines-pro-type-*" + "-cppcoreguidelines-pro-bounds-array-to-pointer-decay" + "-cppcoreguidelines-pro-bounds-pointer-arithmetic" + "-cppcoreguidelines-avoid-c-arrays" + "-cppcoreguidelines-avoid-magic-numbers" + "-cppcoreguidelines-pro-bounds-constant-array-index" + "-cppcoreguidelines-no-malloc" + "-cppcoreguidelines-special-member-functions" + "-cppcoreguidelines-owning-memory" + "-cppcoreguidelines-macro-usage" + "-cppcoreguidelines-avoid-goto" + "-google-readability-function-size" + "-google-readability-namespace-comments" + "-google-readability-braces-around-statements" + "-google-build-using-namespace" + "-hicpp-*" + "-llvm-namespace-comment" + "-llvm-include-order" # Messes up with case sensitivity + "-llvmlibc-*" + "-misc-unused-parameters" + "-modernize-loop-convert" + "-modernize-use-auto" + "-modernize-avoid-c-arrays" + "-modernize-use-nodiscard" + "readability-*" + "-readability-function-size" + "-readability-implicit-bool-conversion" + "-readability-braces-around-statements" + "-readability-else-after-return" + "-readability-magic-numbers" + "-readability-named-parameter" + "-readability-uppercase-literal-suffix" + "-cert-err34-c" + "-cert-err58-cpp" + "-bugprone-exception-escape" + ) + string(REPLACE ";" "," CLANG_TIDY_FLAGS "${CLANG_TIDY_FLAGS}") + set(CMAKE_CXX_CLANG_TIDY ${CLANG_TIDY_EXE} "${CLANG_TIDY_FLAGS}") +endif() + add_compile_options(-Wall) add_subdirectory(External/FEXCore) diff --git a/External/FEXCore/Source/CMakeLists.txt b/External/FEXCore/Source/CMakeLists.txt index 4de03bd37..ed5ce30d3 100644 --- a/External/FEXCore/Source/CMakeLists.txt +++ b/External/FEXCore/Source/CMakeLists.txt @@ -1,50 +1,3 @@ -if (ENABLE_CLANG_FORMAT) - find_program(CLANG_TIDY_EXE "clang-tidy") - set(CLANG_TIDY_FLAGS - "-checks=*" - "-fuchsia*" - "-bugprone-macro-parentheses" - "-clang-analyzer-core.*" - "-cppcoreguidelines-pro-type-*" - "-cppcoreguidelines-pro-bounds-array-to-pointer-decay" - "-cppcoreguidelines-pro-bounds-pointer-arithmetic" - "-cppcoreguidelines-avoid-c-arrays" - "-cppcoreguidelines-avoid-magic-numbers" - "-cppcoreguidelines-pro-bounds-constant-array-index" - "-cppcoreguidelines-no-malloc" - "-cppcoreguidelines-special-member-functions" - "-cppcoreguidelines-owning-memory" - "-cppcoreguidelines-macro-usage" - "-cppcoreguidelines-avoid-goto" - "-google-readability-function-size" - "-google-readability-namespace-comments" - "-google-readability-braces-around-statements" - "-google-build-using-namespace" - "-hicpp-*" - "-llvm-namespace-comment" - "-llvm-include-order" # Messes up with case sensitivity - "-misc-unused-parameters" - "-modernize-loop-convert" - "-modernize-use-auto" - "-modernize-avoid-c-arrays" - "-modernize-use-nodiscard" - "readability-*" - "-readability-function-size" - "-readability-implicit-bool-conversion" - "-readability-braces-around-statements" - "-readability-else-after-return" - "-readability-magic-numbers" - "-readability-named-parameter" - "-readability-uppercase-literal-suffix" - "-cert-err34-c" - "-cert-err58-cpp" - "-bugprone-exception-escape" - ) - string(REPLACE ";" "," CLANG_TIDY_FLAGS "${CLANG_TIDY_FLAGS}") - - set(CMAKE_CXX_CLANG_TIDY ${CLANG_TIDY_EXE} "${CLANG_TIDY_FLAGS}") -endif() - set (SRCS Common/Paths.cpp Common/JitSymbols.cpp diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index f1f1b6418..5370ab6d5 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -1,51 +1,3 @@ -if (ENABLE_CLANG_FORMAT) - find_program(CLANG_TIDY_EXE "clang-tidy") - set(CLANG_TIDY_FLAGS - "-checks=*" - "-fuchsia*" - "-bugprone-macro-parentheses" - "-clang-analyzer-core.*" - "-cppcoreguidelines-pro-type-*" - "-cppcoreguidelines-pro-bounds-array-to-pointer-decay" - "-cppcoreguidelines-pro-bounds-pointer-arithmetic" - "-cppcoreguidelines-avoid-c-arrays" - "-cppcoreguidelines-avoid-magic-numbers" - "-cppcoreguidelines-pro-bounds-constant-array-index" - "-cppcoreguidelines-no-malloc" - "-cppcoreguidelines-special-member-functions" - "-cppcoreguidelines-owning-memory" - "-cppcoreguidelines-macro-usage" - "-cppcoreguidelines-avoid-goto" - "-google-readability-function-size" - "-google-readability-namespace-comments" - "-google-readability-braces-around-statements" - "-google-build-using-namespace" - "-hicpp-*" - "-llvm-namespace-comment" - "-llvm-include-order" # Messes up with case sensitivity - "-misc-unused-parameters" - "-modernize-loop-convert" - "-modernize-use-auto" - "-modernize-avoid-c-arrays" - "-modernize-use-nodiscard" - "readability-*" - "-readability-function-size" - "-readability-implicit-bool-conversion" - "-readability-braces-around-statements" - "-readability-else-after-return" - "-readability-magic-numbers" - "-readability-named-parameter" - "-readability-uppercase-literal-suffix" - "-cert-err34-c" - "-cert-err58-cpp" - "-bugprone-exception-escape" - ) - string(REPLACE ";" "," CLANG_TIDY_FLAGS "${CLANG_TIDY_FLAGS}") - - set(CMAKE_CXX_CLANG_TIDY ${CLANG_TIDY_EXE} "${CLANG_TIDY_FLAGS}") -endif() - - add_subdirectory(Common/) add_subdirectory(CommonCore/) add_subdirectory(Tests/)