Commit 48dce18d3a5670e3911c50ea8334949a6ee01958
Committed by
GitHub
1 parent
4c7c8ddc
fix: single header includes (#828)
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
Showing
2 changed files
with
4 additions
and
2 deletions
include/CLI/Config.hpp
| @@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
| 14 | #include <string> | 14 | #include <string> |
| 15 | #include <utility> | 15 | #include <utility> |
| 16 | #include <vector> | 16 | #include <vector> |
| 17 | -// [CLI11:public_includes:set] | 17 | +// [CLI11:public_includes:end] |
| 18 | 18 | ||
| 19 | #include "App.hpp" | 19 | #include "App.hpp" |
| 20 | #include "ConfigFwd.hpp" | 20 | #include "ConfigFwd.hpp" |
scripts/MakeSingleHeader.py
| @@ -80,7 +80,7 @@ class HeaderGroups(dict): | @@ -80,7 +80,7 @@ class HeaderGroups(dict): | ||
| 80 | """ | 80 | """ |
| 81 | for key in self: | 81 | for key in self: |
| 82 | if isinstance(self[key], set): | 82 | if isinstance(self[key], set): |
| 83 | - self[key] = "\n".join(self[key]) | 83 | + self[key] = "\n".join(sorted(self[key])) |
| 84 | 84 | ||
| 85 | 85 | ||
| 86 | def make_header(output, main_header, files, tag, namespace, macro=None, version=None): | 86 | def make_header(output, main_header, files, tag, namespace, macro=None, version=None): |
| @@ -100,6 +100,8 @@ def make_header(output, main_header, files, tag, namespace, macro=None, version= | @@ -100,6 +100,8 @@ def make_header(output, main_header, files, tag, namespace, macro=None, version= | ||
| 100 | groups["git"] = "" | 100 | groups["git"] = "" |
| 101 | 101 | ||
| 102 | for f in files: | 102 | for f in files: |
| 103 | + if os.path.isdir(f): | ||
| 104 | + continue | ||
| 103 | groups.read_header(f) | 105 | groups.read_header(f) |
| 104 | 106 | ||
| 105 | groups["namespace"] = namespace | 107 | groups["namespace"] = namespace |