From a8aa89352a448fe9290532ad7b1d24d7e1b5e21e Mon Sep 17 00:00:00 2001
From: Marc Chevrier <marc.chevrier@gmail.com>
Date: Fri, 3 Jan 2020 18:44:48 +0100
Subject: 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.
---
 .clang-format                 | 2 ++
 Source/cmComputeLinkDepends.h | 3 +--
 Source/cmDependsC.h           | 3 +--
 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"
-- 
cgit v0.12