diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2020-01-03 17:44:48 (GMT) |
|---|---|---|
| committer | Marc Chevrier <marc.chevrier@gmail.com> | 2020-01-06 16:33:45 (GMT) |
| commit | a8aa89352a448fe9290532ad7b1d24d7e1b5e21e (patch) | |
| tree | f752c915645391735de5092dd60133e78dd71378 | |
| parent | b67c53dddfcf956f4d55cbdc0f4e7705f62e805b (diff) | |
| download | CMake-a8aa89352a448fe9290532ad7b1d24d7e1b5e21e.zip CMake-a8aa89352a448fe9290532ad7b1d24d7e1b5e21e.tar.gz CMake-a8aa89352a448fe9290532ad7b1d24d7e1b5e21e.tar.bz2 | |
clang-format: fix erroneous handling of header <queue>
The rule Regex: '^<' was not applied to this header because a more specific one applies: Regex: '^(<|")Qt?[A-Z]' used for Qt headers (rules are not case-sensitive). So adding a specific rule for this header before the Qt rule is required.
| -rw-r--r-- | .clang-format | 2 | ||||
| -rw-r--r-- | Source/cmComputeLinkDepends.h | 3 | ||||
| -rw-r--r-- | Source/cmDependsC.h | 3 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/.clang-format b/.clang-format index a7f049a..4bfce44 100644 --- a/.clang-format +++ b/.clang-format @@ -22,6 +22,8 @@ IncludeBlocks: Regroup IncludeCategories: - Regex: '^[<"]cmConfigure\.h' Priority: -1 + - Regex: '^<queue>' + Priority: 1 - Regex: '^(<|")cm(ext)?/' Priority: 2 - Regex: '^(<|")windows\.h' diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h index 645189a..47c821b 100644 --- a/Source/cmComputeLinkDepends.h +++ b/Source/cmComputeLinkDepends.h @@ -7,12 +7,11 @@ #include <map> #include <memory> +#include <queue> #include <set> #include <string> #include <vector> -#include <queue> - #include "cmGraphAdjacencyList.h" #include "cmLinkItem.h" #include "cmTargetLinkLibraryType.h" diff --git a/Source/cmDependsC.h b/Source/cmDependsC.h index 3bb6e36..868c94a 100644 --- a/Source/cmDependsC.h +++ b/Source/cmDependsC.h @@ -7,12 +7,11 @@ #include <iosfwd> #include <map> +#include <queue> #include <set> #include <string> #include <vector> -#include <queue> - #include "cmsys/RegularExpression.hxx" #include "cmDepends.h" diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 927364d..523083a 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -10,6 +10,7 @@ #include <cstdlib> #include <cstring> #include <iterator> +#include <queue> #include <sstream> #include <unordered_set> #include <utility> @@ -17,8 +18,6 @@ #include <cm/memory> #include <cm/string_view> -#include <queue> - #include "cmsys/RegularExpression.hxx" #include "cmAlgorithms.h" |