refactor: use single-include dir

Signed-off-by: Henry Schreiner <[email protected]>
CLIUtils · May 1, 2024 · 8267dde · 8267dde
1 parent 50cf682
commit 8267dde
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 34 deletions.
diff --git a/meson.build b/meson.build
@@ -14,7 +14,38 @@ if use_precompiled and use_single_header
   error('Options "single-file"header" and "precompiled" are mutually exclusive')
 endif
 
-subdir('include/CLI')
+cli11_headers = files(
+  'include/CLI/App.hpp',
+  'include/CLI/Argv.hpp',
+  'include/CLI/CLI.hpp',
+  'include/CLI/Config.hpp',
+  'include/CLI/ConfigFwd.hpp',
+  'include/CLI/Encoding.hpp',
+  'include/CLI/Error.hpp',
+  'include/CLI/Formatter.hpp',
+  'include/CLI/FormatterFwd.hpp',
+  'include/CLI/Macros.hpp',
+  'include/CLI/Option.hpp',
+  'include/CLI/Split.hpp',
+  'include/CLI/StringTools.hpp',
+  'include/CLI/TypeTools.hpp',
+  'include/CLI/Validators.hpp',
+  'include/CLI/Version.hpp',
+)
+
+cli11_impl_headers = files(
+  'include/CLI/impl/App_inl.hpp',
+  'include/CLI/impl/Argv_inl.hpp',
+  'include/CLI/impl/Config_inl.hpp',
+  'include/CLI/impl/Encoding_inl.hpp',
+  'include/CLI/impl/Formatter_inl.hpp',
+  'include/CLI/impl/Option_inl.hpp',
+  'include/CLI/impl/Split_inl.hpp',
+  'include/CLI/impl/StringTools_inl.hpp',
+  'include/CLI/impl/Validators_inl.hpp',
+)
+
+subdir('single-include')
 
 CLI11_inc = include_directories(['include'])
 

diff --git a/include/CLI/meson.build → single-include/meson.build b/include/CLI/meson.build → single-include/meson.build
@@ -4,43 +4,12 @@
 
 prog_python = find_program('python')
 
-cli11_headers = files(
-  'App.hpp',
-  'Argv.hpp',
-  'CLI.hpp',
-  'Config.hpp',
-  'ConfigFwd.hpp',
-  'Encoding.hpp',
-  'Error.hpp',
-  'Formatter.hpp',
-  'FormatterFwd.hpp',
-  'Macros.hpp',
-  'Option.hpp',
-  'Split.hpp',
-  'StringTools.hpp',
-  'TypeTools.hpp',
-  'Validators.hpp',
-  'Version.hpp',
-)
-
-cli11_impl_headers = files(
-  'impl/App_inl.hpp',
-  'impl/Argv_inl.hpp',
-  'impl/Config_inl.hpp',
-  'impl/Encoding_inl.hpp',
-  'impl/Formatter_inl.hpp',
-  'impl/Option_inl.hpp',
-  'impl/Split_inl.hpp',
-  'impl/StringTools_inl.hpp',
-  'impl/Validators_inl.hpp',
-)
-
-single_main_file = files('../../CLI11.hpp.in')
+single_main_file = files('CLI11.hpp.in')
 
 if use_single_header
   single_header = custom_target(
     'CLI11.hpp',
-    input: [files('../../scripts/MakeSingleHeader.py'), cli11_headers, cli11_impl_headers],
+    input: [files('../scripts/MakeSingleHeader.py'), cli11_headers, cli11_impl_headers],
     output: 'CLI11.hpp',
     command : [prog_python, '@INPUT@', '--main', single_main_file, '--output', '@OUTPUT@'],
     depend_files: [single_main_file],