From ca33fd7752fccb7c9898de7b3c393935188ca0aa Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Sun, 10 Sep 2017 22:53:41 +0200 Subject: [PATCH] make usage of clang-tidy configurable --- cmake/libsuperderpy.cmake | 17 ++++++++--------- src/internal.c | 4 +++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/cmake/libsuperderpy.cmake b/cmake/libsuperderpy.cmake index 955d9a3..3b795c6 100644 --- a/cmake/libsuperderpy.cmake +++ b/cmake/libsuperderpy.cmake @@ -16,15 +16,14 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") endif(APPLE) - find_program( - CLANG_TIDY_EXE - NAMES "clang-tidy" - DOC "Path to clang-tidy executable" - ) - if(NOT CLANG_TIDY_EXE) - message(STATUS "clang-tidy not found.") - else() - set(CMAKE_C_CLANG_TIDY "${CLANG_TIDY_EXE}" "-checks=*,-clang-analyzer-alpha.*,-google-readability-todo,-performance-type-promotion-in-math-fn,-misc-unused-parameters,-cert-msc30-c,-cert-msc50-cpp") + set(USE_CLANG_TIDY "yes" CACHE STRING "Analyze the code with clang-tidy" ) + if(USE_CLANG_TIDY) + find_program(CLANG_TIDY_EXE NAMES "clang-tidy" DOC "Path to clang-tidy executable") + if(NOT CLANG_TIDY_EXE) + message(STATUS "clang-tidy not found, analysis disabled") + else() + set(CMAKE_C_CLANG_TIDY "${CLANG_TIDY_EXE}" "-checks=*,-clang-analyzer-alpha.*,-google-readability-todo,-performance-type-promotion-in-math-fn,-misc-unused-parameters,-cert-msc30-c,-cert-msc50-cpp") + endif() endif() if(APPLE) diff --git a/src/internal.c b/src/internal.c index b29a704..117832e 100644 --- a/src/internal.c +++ b/src/internal.c @@ -188,7 +188,9 @@ SYMBOL_INTERNAL void GamestateProgress(struct Game* game) { } #ifdef LIBSUPERDERPY_SINGLE_THREAD DrawGamestates(game); - if (tmp->showLoading) (*game->_priv.loading.gamestate->api->Gamestate_Draw)(game, game->_priv.loading.gamestate->data); + if (tmp->showLoading) { + (*game->_priv.loading.gamestate->api->Gamestate_Draw)(game, game->_priv.loading.gamestate->data); + } DrawConsole(game); al_flip_display(); #endif