From 7e49d3994fc96e7e6fa33ac3cf16651294396b42 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 1 May 2017 03:03:20 +0200 Subject: [PATCH] Allow skipping creation of tidy target --- cmake/modules/BasicConfig.cmake | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/cmake/modules/BasicConfig.cmake b/cmake/modules/BasicConfig.cmake index 06f1673..8ea352e 100644 --- a/cmake/modules/BasicConfig.cmake +++ b/cmake/modules/BasicConfig.cmake @@ -162,12 +162,14 @@ else() endif() # find coding style (use style from c++utilities if none included in own project dir) -set(CLANG_FORMAT_RULES "${CMAKE_CURRENT_SOURCE_DIR}/coding-style.clang-format") -if(CPP_UTILITIES_SOURCE_DIR AND NOT EXISTS "${CLANG_FORMAT_RULES}") - set(CLANG_FORMAT_RULES "${CPP_UTILITIES_SOURCE_DIR}/coding-style.clang-format") -endif() -if(NOT EXISTS "${CLANG_FORMAT_RULES}") - set(CLANG_FORMAT_RULES "${CPP_UTILITIES_CONFIG_DIRS}/codingstyle.clang-format") +if(NOT META_NO_TIDY) + set(CLANG_FORMAT_RULES "${CMAKE_CURRENT_SOURCE_DIR}/coding-style.clang-format") + if(CPP_UTILITIES_SOURCE_DIR AND NOT EXISTS "${CLANG_FORMAT_RULES}") + set(CLANG_FORMAT_RULES "${CPP_UTILITIES_SOURCE_DIR}/coding-style.clang-format") + endif() + if(NOT EXISTS "${CLANG_FORMAT_RULES}") + set(CLANG_FORMAT_RULES "${CPP_UTILITIES_CONFIG_DIRS}/codingstyle.clang-format") + endif() endif() # add autotools-style check target @@ -187,7 +189,7 @@ if(HAS_PARENT) endif() # add target for tidying with clang-format -if(EXISTS "${CLANG_FORMAT_RULES}") +if(NOT META_NO_TIDY AND EXISTS "${CLANG_FORMAT_RULES}") find_program(CLANG_FORMAT_BIN clang-format) if(CLANG_FORMAT_BIN) set(FORMATABLE_FILES ${HEADER_FILES} ${SRC_FILES} ${WIDGETS_HEADER_FILES} ${WIDGETS_SRC_FILES} ${QML_HEADER_FILES} ${QML_SRC_FILES})