diff options
author | Brad King <brad.king@kitware.com> | 2016-11-08 16:40:20 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-11-08 16:40:20 (GMT) |
commit | 36f9f0f8a3e7640c12034fff8871b779cba9f0ce (patch) | |
tree | 6976fbc39e57b12f44e86906e5b6a565dcdc23fe /Utilities | |
parent | 666bb0e3fa0d212c03f785bd9f6bc05d29925e1f (diff) | |
download | CMake-36f9f0f8a3e7640c12034fff8871b779cba9f0ce.zip CMake-36f9f0f8a3e7640c12034fff8871b779cba9f0ce.tar.gz CMake-36f9f0f8a3e7640c12034fff8871b779cba9f0ce.tar.bz2 |
Drop KWStyle checks in favor of clang-format and Git hooks
We now define code layout by clang-format and enforce whitespace with
Git hooks. There is no need to run KWStyle anymore, as all we used it
to check was line length anyway.
Diffstat (limited to 'Utilities')
-rw-r--r-- | Utilities/CMakeLists.txt | 2 | ||||
-rw-r--r-- | Utilities/KWStyle/CMake.kws.xml.in | 11 | ||||
-rw-r--r-- | Utilities/KWStyle/CMakeFiles.txt.in | 15 | ||||
-rw-r--r-- | Utilities/KWStyle/CMakeLists.txt | 69 | ||||
-rw-r--r-- | Utilities/KWStyle/CMakeMoreChecks.kws.xml.in | 30 | ||||
-rw-r--r-- | Utilities/KWStyle/CMakeOverwrite.txt | 0 |
6 files changed, 1 insertions, 126 deletions
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt index 1e51ea2..014204b 100644 --- a/Utilities/CMakeLists.txt +++ b/Utilities/CMakeLists.txt @@ -1,7 +1,7 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -subdirs(Doxygen KWStyle) +subdirs(Doxygen) if(CMAKE_DOC_TARBALL) # Undocumented option to extract and install pre-built documentation. diff --git a/Utilities/KWStyle/CMake.kws.xml.in b/Utilities/KWStyle/CMake.kws.xml.in deleted file mode 100644 index c2b4429..0000000 --- a/Utilities/KWStyle/CMake.kws.xml.in +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<Description> -<LineLength>79</LineLength> -<!-- -<Header>"@CMake_SOURCE_DIR@/Utilities/KWStyle/Headers",false,true</Header> -<Functions> -<regex>[A-Z]</regex> -<length>100</length> -</Functions> ---> -</Description> diff --git a/Utilities/KWStyle/CMakeFiles.txt.in b/Utilities/KWStyle/CMakeFiles.txt.in deleted file mode 100644 index a95aac6..0000000 --- a/Utilities/KWStyle/CMakeFiles.txt.in +++ /dev/null @@ -1,15 +0,0 @@ -"@CMake_SOURCE_DIR@/Source/*.txx" -"@CMake_SOURCE_DIR@/Source/*.cxx" -"@CMake_SOURCE_DIR@/Source/*.h*" -"@CMake_SOURCE_DIR@/Source/CPack/*.txx" -"@CMake_SOURCE_DIR@/Source/CPack/*.cxx" -"@CMake_SOURCE_DIR@/Source/CPack/*.h*" -"@CMake_SOURCE_DIR@/Source/CTest/*.txx" -"@CMake_SOURCE_DIR@/Source/CTest/*.cxx" -"@CMake_SOURCE_DIR@/Source/CTest/*.h*" -"@CMake_SOURCE_DIR@/Source/CurseDialog/*.h*" -"@CMake_SOURCE_DIR@/Source/CurseDialog/*.cxx" -"@CMake_SOURCE_DIR@/Source/CurseDialog/*.txx" --f (Lexer\.h) --f (Lexer\.cxx) --f (Parser\.cxx) diff --git a/Utilities/KWStyle/CMakeLists.txt b/Utilities/KWStyle/CMakeLists.txt deleted file mode 100644 index 3e96c33..0000000 --- a/Utilities/KWStyle/CMakeLists.txt +++ /dev/null @@ -1,69 +0,0 @@ -# Distributed under the OSI-approved BSD 3-Clause License. See accompanying -# file Copyright.txt or https://cmake.org/licensing for details. - -#----------------------------------------------------------------------------- -# CMake uses KWStyle for checking the coding style - -# Search for a built-from-source KWStyle under Dashboards/Support on a typical -# dashboard machines: -# -set(home "$ENV{HOME}") -if(NOT home) - string(REPLACE "\\" "/" home "$ENV{USERPROFILE}") -endif() - -find_program(KWSTYLE_EXECUTABLE - NAMES KWStyle - PATHS - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Kitware Inc.\\KWStyle 1.0.0]/bin" - "${home}/Dashboards/Support/KWStyle/bin" - ) -mark_as_advanced(KWSTYLE_EXECUTABLE) - -set(CMAKE_USE_KWSTYLE_DEFAULT OFF) -if(KWSTYLE_EXECUTABLE) - set(CMAKE_USE_KWSTYLE_DEFAULT ON) -endif() - -option(CMAKE_USE_KWSTYLE - "Add StyleCheck target and KWStyle test: run KWStyle to check for coding standard violations." - ${CMAKE_USE_KWSTYLE_DEFAULT}) -mark_as_advanced(CMAKE_USE_KWSTYLE) - -if(CMAKE_USE_KWSTYLE) - option(KWSTYLE_USE_VIM_FORMAT "Set KWStyle to generate errors with a VIM-compatible format." OFF) - option(KWSTYLE_USE_MSVC_FORMAT "Set KWStyle to generate errors with a VisualStudio-compatible format." OFF) - mark_as_advanced(KWSTYLE_USE_VIM_FORMAT) - mark_as_advanced(KWSTYLE_USE_MSVC_FORMAT) - - if(KWSTYLE_USE_VIM_FORMAT) - set(KWSTYLE_ARGUMENTS -vim ${KWSTYLE_ARGUMENTS}) - endif() - - if(KWSTYLE_USE_MSVC_FORMAT) - set(KWSTYLE_ARGUMENTS -msvc ${KWSTYLE_ARGUMENTS}) - endif() - - configure_file(${CMake_SOURCE_DIR}/Utilities/KWStyle/CMake.kws.xml.in - ${CMake_BINARY_DIR}/CMake.kws.xml) - configure_file(${CMake_SOURCE_DIR}/Utilities/KWStyle/CMakeMoreChecks.kws.xml.in - ${CMake_BINARY_DIR}/CMakeMoreChecks.kws.xml) - - configure_file(${CMake_SOURCE_DIR}/Utilities/KWStyle/CMakeFiles.txt.in - ${CMake_BINARY_DIR}/CMakeKWSFiles.txt) - - add_custom_command( - OUTPUT ${CMake_BINARY_DIR}/KWStyleReport.txt - COMMAND ${KWSTYLE_EXECUTABLE} - ARGS -xml ${CMake_BINARY_DIR}/CMake.kws.xml -o ${CMake_SOURCE_DIR}/Utilities/KWStyle/CMakeOverwrite.txt -v ${KWSTYLE_ARGUMENTS} -D ${CMake_BINARY_DIR}/CMakeKWSFiles.txt - COMMENT "Coding Style Checker" - ) - - add_custom_target(MoreStyleChecks - COMMAND ${KWSTYLE_EXECUTABLE} - -xml ${CMake_BINARY_DIR}/CMakeMoreChecks.kws.xml -html ${CMake_BINARY_DIR}/html -o ${CMake_SOURCE_DIR}/Utilities/KWStyle/CMakeOverwrite.txt -v ${KWSTYLE_ARGUMENTS} -D ${CMake_BINARY_DIR}/CMakeKWSFiles.txt - COMMENT "Coding Style Checker, more checks enabled" - ) - - add_custom_target(StyleCheck DEPENDS ${CMake_BINARY_DIR}/KWStyleReport.txt) -endif() diff --git a/Utilities/KWStyle/CMakeMoreChecks.kws.xml.in b/Utilities/KWStyle/CMakeMoreChecks.kws.xml.in deleted file mode 100644 index c48e92f..0000000 --- a/Utilities/KWStyle/CMakeMoreChecks.kws.xml.in +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<Description> - <ErrorThreshold>10</ErrorThreshold> - <LineLength>79</LineLength> - <Header>"@CMake_SOURCE_DIR@/Utilities/KWStyle/Headers",false,true</Header> - <Functions> - <regex>^(cm)?[A-Z]</regex> - <length>200</length> - </Functions> - <InternalVariables> - <regex>^[A-Z]</regex> - <alignment>0</alignment> - </InternalVariables> - <SemicolonSpace>0</SemicolonSpace> - <DeclarationOrder> - <public>0</public> - <protected>1</protected> - <private>2</private> - </DeclarationOrder> - <Tabs>1</Tabs> - <EmptyLines>4</EmptyLines> - <StatementPerLine> - <maxNumber>1</maxNumber> - <checkInline>0</checkInline> - </StatementPerLine> - <VariablePerLine> - <maxNumber>1</maxNumber> - </VariablePerLine> - <BadCharacters>true</BadCharacters> -</Description> diff --git a/Utilities/KWStyle/CMakeOverwrite.txt b/Utilities/KWStyle/CMakeOverwrite.txt deleted file mode 100644 index e69de29..0000000 --- a/Utilities/KWStyle/CMakeOverwrite.txt +++ /dev/null |