From ffd11bfc01a736c520b2350438138e35fc865fd5 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Mon, 11 Mar 2024 16:35:13 +0100
Subject: [PATCH] Fix internal header include paths. (#1011)

The extra leading `"CLI/"` part of include directives prevents the
inclusion of `CLI.hpp` from a relative directory without an extra `-I`
or `/I` compiler directive, and makes it harder to make CLI11 part of a
larger codebase.

This is a regression of #475.
---
 include/CLI/Argv.hpp                 |  2 +-
 include/CLI/Encoding.hpp             |  2 +-
 include/CLI/impl/App_inl.hpp         |  6 +++---
 include/CLI/impl/Argv_inl.hpp        |  4 ++--
 include/CLI/impl/Config_inl.hpp      |  2 +-
 include/CLI/impl/Encoding_inl.hpp    |  4 ++--
 include/CLI/impl/Formatter_inl.hpp   |  2 +-
 include/CLI/impl/Option_inl.hpp      |  2 +-
 include/CLI/impl/Split_inl.hpp       |  6 +++---
 include/CLI/impl/StringTools_inl.hpp |  2 +-
 include/CLI/impl/Validators_inl.hpp  | 10 +++++-----
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/include/CLI/Argv.hpp b/include/CLI/Argv.hpp
index 619a7abf..1aab0c0b 100644
--- a/include/CLI/Argv.hpp
+++ b/include/CLI/Argv.hpp
@@ -11,7 +11,7 @@
 #include <vector>
 // [CLI11:public_includes:end]
 
-#include <CLI/Macros.hpp>
+#include "Macros.hpp"
 
 namespace CLI {
 // [CLI11:argv_hpp:verbatim]
diff --git a/include/CLI/Encoding.hpp b/include/CLI/Encoding.hpp
index d723878f..cd282993 100644
--- a/include/CLI/Encoding.hpp
+++ b/include/CLI/Encoding.hpp
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <CLI/Macros.hpp>
+#include "Macros.hpp"
 
 // [CLI11:public_includes:set]
 #include <string>
diff --git a/include/CLI/impl/App_inl.hpp b/include/CLI/impl/App_inl.hpp
index 205187fe..dc53ae70 100644
--- a/include/CLI/impl/App_inl.hpp
+++ b/include/CLI/impl/App_inl.hpp
@@ -7,10 +7,10 @@
 #pragma once
 
 // This include is only needed for IDEs to discover symbols
-#include <CLI/App.hpp>
+#include "../App.hpp"
 
-#include <CLI/Argv.hpp>
-#include <CLI/Encoding.hpp>
+#include "../Argv.hpp"
+#include "../Encoding.hpp"
 
 // [CLI11:public_includes:set]
 #include <algorithm>
diff --git a/include/CLI/impl/Argv_inl.hpp b/include/CLI/impl/Argv_inl.hpp
index b3c328b1..78987ab5 100644
--- a/include/CLI/impl/Argv_inl.hpp
+++ b/include/CLI/impl/Argv_inl.hpp
@@ -7,9 +7,9 @@
 #pragma once
 
 // This include is only needed for IDEs to discover symbols
-#include <CLI/Argv.hpp>
+#include "../Argv.hpp"
 
-#include <CLI/Encoding.hpp>
+#include "../Encoding.hpp"
 
 // [CLI11:public_includes:set]
 #include <algorithm>
diff --git a/include/CLI/impl/Config_inl.hpp b/include/CLI/impl/Config_inl.hpp
index 92537c0e..88f362b4 100644
--- a/include/CLI/impl/Config_inl.hpp
+++ b/include/CLI/impl/Config_inl.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 // This include is only needed for IDEs to discover symbols
-#include <CLI/Config.hpp>
+#include "../Config.hpp"
 
 // [CLI11:public_includes:set]
 #include <algorithm>
diff --git a/include/CLI/impl/Encoding_inl.hpp b/include/CLI/impl/Encoding_inl.hpp
index 1c82f4fc..a95e3a8b 100644
--- a/include/CLI/impl/Encoding_inl.hpp
+++ b/include/CLI/impl/Encoding_inl.hpp
@@ -7,8 +7,8 @@
 #pragma once
 
 // This include is only needed for IDEs to discover symbols
-#include <CLI/Encoding.hpp>
-#include <CLI/Macros.hpp>
+#include "../Encoding.hpp"
+#include "../Macros.hpp"
 
 // [CLI11:public_includes:set]
 #include <array>
diff --git a/include/CLI/impl/Formatter_inl.hpp b/include/CLI/impl/Formatter_inl.hpp
index 3b1c8c28..b6e91f83 100644
--- a/include/CLI/impl/Formatter_inl.hpp
+++ b/include/CLI/impl/Formatter_inl.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 // This include is only needed for IDEs to discover symbols
-#include <CLI/Formatter.hpp>
+#include "../Formatter.hpp"
 
 // [CLI11:public_includes:set]
 #include <algorithm>
diff --git a/include/CLI/impl/Option_inl.hpp b/include/CLI/impl/Option_inl.hpp
index aa6f4657..182b3f32 100644
--- a/include/CLI/impl/Option_inl.hpp
+++ b/include/CLI/impl/Option_inl.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 // This include is only needed for IDEs to discover symbols
-#include <CLI/Option.hpp>
+#include "../Option.hpp"
 
 // [CLI11:public_includes:set]
 #include <algorithm>
diff --git a/include/CLI/impl/Split_inl.hpp b/include/CLI/impl/Split_inl.hpp
index 7cd8e5b3..360e5838 100644
--- a/include/CLI/impl/Split_inl.hpp
+++ b/include/CLI/impl/Split_inl.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 // This include is only needed for IDEs to discover symbols
-#include <CLI/Split.hpp>
+#include "../Split.hpp"
 
 // [CLI11:public_includes:set]
 #include <string>
@@ -16,8 +16,8 @@
 #include <vector>
 // [CLI11:public_includes:end]
 
-#include <CLI/Error.hpp>
-#include <CLI/StringTools.hpp>
+#include "../Error.hpp"
+#include "../StringTools.hpp"
 
 namespace CLI {
 // [CLI11:split_inl_hpp:verbatim]
diff --git a/include/CLI/impl/StringTools_inl.hpp b/include/CLI/impl/StringTools_inl.hpp
index bab79a37..4a212a20 100644
--- a/include/CLI/impl/StringTools_inl.hpp
+++ b/include/CLI/impl/StringTools_inl.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 // This include is only needed for IDEs to discover symbols
-#include <CLI/StringTools.hpp>
+#include "../StringTools.hpp"
 
 // [CLI11:public_includes:set]
 #include <cstdint>
diff --git a/include/CLI/impl/Validators_inl.hpp b/include/CLI/impl/Validators_inl.hpp
index bf73e21a..53cf07b2 100644
--- a/include/CLI/impl/Validators_inl.hpp
+++ b/include/CLI/impl/Validators_inl.hpp
@@ -6,12 +6,12 @@
 
 #pragma once
 
-#include <CLI/Validators.hpp>
+#include "../Validators.hpp"
 
-#include <CLI/Encoding.hpp>
-#include <CLI/Macros.hpp>
-#include <CLI/StringTools.hpp>
-#include <CLI/TypeTools.hpp>
+#include "../Encoding.hpp"
+#include "../Macros.hpp"
+#include "../StringTools.hpp"
+#include "../TypeTools.hpp"
 
 // [CLI11:public_includes:set]
 #include <map>