diff options
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Utilities/GitSetup/config | 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 | ||||
| -rw-r--r-- | Utilities/Release/README | 2 | ||||
| -rw-r--r-- | Utilities/Release/linux64_release.cmake | 1 | ||||
| -rw-r--r-- | Utilities/Release/osx_release.cmake | 2 | ||||
| -rwxr-xr-x | Utilities/Scripts/clang-format.bash | 1 |
11 files changed, 6 insertions, 129 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/GitSetup/config b/Utilities/GitSetup/config index b7d5423..d69a679 100644 --- a/Utilities/GitSetup/config +++ b/Utilities/GitSetup/config @@ -1,5 +1,5 @@ [hooks] - url = http://cmake.org/cmake.git + url = https://cmake.org/cmake.git [ssh] host = cmake.org key = id_git_cmake 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 diff --git a/Utilities/Release/README b/Utilities/Release/README index ed1d52e..11de1c3 100644 --- a/Utilities/Release/README +++ b/Utilities/Release/README @@ -1,7 +1,7 @@ To create a cmake release, make sure the "release" tag is pointing to the expected git commit: -http://cmake.org/gitweb?p=cmake.git;a=shortlog;h=refs/heads/release +https://cmake.org/gitweb?p=cmake.git;a=shortlog;h=refs/heads/release Then as kitware@hythloth, using an up-to-date CMake: diff --git a/Utilities/Release/linux64_release.cmake b/Utilities/Release/linux64_release.cmake index b72fc12..b9447ca 100644 --- a/Utilities/Release/linux64_release.cmake +++ b/Utilities/Release/linux64_release.cmake @@ -2,6 +2,7 @@ set(PROCESSORS 4) set(BOOTSTRAP_ARGS "--docdir=doc/cmake") set(HOST linux64) set(MAKE_PROGRAM "make") +set(CPACK_BINARY_GENERATORS "STGZ TGZ") set(CC /opt/gcc-6.1.0/bin/gcc) set(CXX /opt/gcc-6.1.0/bin/g++) set(CFLAGS "") diff --git a/Utilities/Release/osx_release.cmake b/Utilities/Release/osx_release.cmake index 27c820f..88ea39b 100644 --- a/Utilities/Release/osx_release.cmake +++ b/Utilities/Release/osx_release.cmake @@ -4,7 +4,7 @@ set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake") set(HOST dragnipur) set(MAKE_PROGRAM "make") set(MAKE "${MAKE_PROGRAM} -j5") -set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ") +set(CPACK_BINARY_GENERATORS "DragNDrop TGZ") set(CPACK_SOURCE_GENERATORS "TGZ TZ") set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size set(CC clang) diff --git a/Utilities/Scripts/clang-format.bash b/Utilities/Scripts/clang-format.bash index a7080fc..ad3b3a1 100755 --- a/Utilities/Scripts/clang-format.bash +++ b/Utilities/Scripts/clang-format.bash @@ -130,6 +130,7 @@ $git_ls -z -- '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' | # Exclude manually-formatted sources (e.g. with long lines). egrep -z -v '^Tests/PositionIndependentTargets/pic_test.h' | + egrep -z -v '^Tests/CompileFeatures/cxx_right_angle_brackets.cpp' | # Exclude sources with encoding not suported by clang-format. egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' | |