From 77a8a67f6cd2eb623ab392b1f68a1cc32ed8e580 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Wed, 30 Aug 2023 23:02:52 +0300 Subject: [PATCH] move lib/thirdparty to thirdparty/ --- lib/utils/meson.build | 7 ++++--- {lib/thirdparty => thirdparty}/CLI11.hpp | 0 {lib/thirdparty => thirdparty}/fmt/LICENSE.rst | 0 {lib/thirdparty => thirdparty}/fmt/args.h | 0 {lib/thirdparty => thirdparty}/fmt/chrono.h | 0 {lib/thirdparty => thirdparty}/fmt/color.h | 0 {lib/thirdparty => thirdparty}/fmt/compile.h | 0 {lib/thirdparty => thirdparty}/fmt/core.h | 0 {lib/thirdparty => thirdparty}/fmt/format-inl.h | 0 {lib/thirdparty => thirdparty}/fmt/format.h | 0 {lib/thirdparty => thirdparty}/fmt/os.h | 0 {lib/thirdparty => thirdparty}/fmt/ostream.h | 0 {lib/thirdparty => thirdparty}/fmt/printf.h | 0 {lib/thirdparty => thirdparty}/fmt/ranges.h | 0 {lib/thirdparty => thirdparty}/fmt/std.h | 0 {lib/thirdparty => thirdparty}/fmt/xchar.h | 0 {lib/thirdparty => thirdparty}/tabulate.hpp | 0 {lib/thirdparty => thirdparty}/tl/expected.hpp | 0 {lib/thirdparty => thirdparty}/tl/optional.hpp | 0 19 files changed, 4 insertions(+), 3 deletions(-) rename {lib/thirdparty => thirdparty}/CLI11.hpp (100%) rename {lib/thirdparty => thirdparty}/fmt/LICENSE.rst (100%) rename {lib/thirdparty => thirdparty}/fmt/args.h (100%) rename {lib/thirdparty => thirdparty}/fmt/chrono.h (100%) rename {lib/thirdparty => thirdparty}/fmt/color.h (100%) rename {lib/thirdparty => thirdparty}/fmt/compile.h (100%) rename {lib/thirdparty => thirdparty}/fmt/core.h (100%) rename {lib/thirdparty => thirdparty}/fmt/format-inl.h (100%) rename {lib/thirdparty => thirdparty}/fmt/format.h (100%) rename {lib/thirdparty => thirdparty}/fmt/os.h (100%) rename {lib/thirdparty => thirdparty}/fmt/ostream.h (100%) rename {lib/thirdparty => thirdparty}/fmt/printf.h (100%) rename {lib/thirdparty => thirdparty}/fmt/ranges.h (100%) rename {lib/thirdparty => thirdparty}/fmt/std.h (100%) rename {lib/thirdparty => thirdparty}/fmt/xchar.h (100%) rename {lib/thirdparty => thirdparty}/tabulate.hpp (100%) rename {lib/thirdparty => thirdparty}/tl/expected.hpp (100%) rename {lib/thirdparty => thirdparty}/tl/optional.hpp (100%) diff --git a/lib/utils/meson.build b/lib/utils/meson.build index c29b6d68..1351608f 100644 --- a/lib/utils/meson.build +++ b/lib/utils/meson.build @@ -15,6 +15,8 @@ ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +thirdparty=join_paths('..', '..', 'thirdparty') + lib_mu_utils=static_library('mu-utils', [ 'mu-command-handler.cc', 'mu-html-to-text.cc', @@ -34,15 +36,14 @@ lib_mu_utils=static_library('mu-utils', [ readline_dep, cld2_dep ], include_directories: - include_directories(['.','..', '../thirdparty/']), + include_directories(['.', '..', thirdparty]), install: false) lib_mu_utils_dep = declare_dependency( link_with: lib_mu_utils, compile_args: '-DFMT_HEADER_ONLY', include_directories: - include_directories(['.', '..', '../thirdparty']) -) + include_directories(['.', '..', thirdparty])) # # tools diff --git a/lib/thirdparty/CLI11.hpp b/thirdparty/CLI11.hpp similarity index 100% rename from lib/thirdparty/CLI11.hpp rename to thirdparty/CLI11.hpp diff --git a/lib/thirdparty/fmt/LICENSE.rst b/thirdparty/fmt/LICENSE.rst similarity index 100% rename from lib/thirdparty/fmt/LICENSE.rst rename to thirdparty/fmt/LICENSE.rst diff --git a/lib/thirdparty/fmt/args.h b/thirdparty/fmt/args.h similarity index 100% rename from lib/thirdparty/fmt/args.h rename to thirdparty/fmt/args.h diff --git a/lib/thirdparty/fmt/chrono.h b/thirdparty/fmt/chrono.h similarity index 100% rename from lib/thirdparty/fmt/chrono.h rename to thirdparty/fmt/chrono.h diff --git a/lib/thirdparty/fmt/color.h b/thirdparty/fmt/color.h similarity index 100% rename from lib/thirdparty/fmt/color.h rename to thirdparty/fmt/color.h diff --git a/lib/thirdparty/fmt/compile.h b/thirdparty/fmt/compile.h similarity index 100% rename from lib/thirdparty/fmt/compile.h rename to thirdparty/fmt/compile.h diff --git a/lib/thirdparty/fmt/core.h b/thirdparty/fmt/core.h similarity index 100% rename from lib/thirdparty/fmt/core.h rename to thirdparty/fmt/core.h diff --git a/lib/thirdparty/fmt/format-inl.h b/thirdparty/fmt/format-inl.h similarity index 100% rename from lib/thirdparty/fmt/format-inl.h rename to thirdparty/fmt/format-inl.h diff --git a/lib/thirdparty/fmt/format.h b/thirdparty/fmt/format.h similarity index 100% rename from lib/thirdparty/fmt/format.h rename to thirdparty/fmt/format.h diff --git a/lib/thirdparty/fmt/os.h b/thirdparty/fmt/os.h similarity index 100% rename from lib/thirdparty/fmt/os.h rename to thirdparty/fmt/os.h diff --git a/lib/thirdparty/fmt/ostream.h b/thirdparty/fmt/ostream.h similarity index 100% rename from lib/thirdparty/fmt/ostream.h rename to thirdparty/fmt/ostream.h diff --git a/lib/thirdparty/fmt/printf.h b/thirdparty/fmt/printf.h similarity index 100% rename from lib/thirdparty/fmt/printf.h rename to thirdparty/fmt/printf.h diff --git a/lib/thirdparty/fmt/ranges.h b/thirdparty/fmt/ranges.h similarity index 100% rename from lib/thirdparty/fmt/ranges.h rename to thirdparty/fmt/ranges.h diff --git a/lib/thirdparty/fmt/std.h b/thirdparty/fmt/std.h similarity index 100% rename from lib/thirdparty/fmt/std.h rename to thirdparty/fmt/std.h diff --git a/lib/thirdparty/fmt/xchar.h b/thirdparty/fmt/xchar.h similarity index 100% rename from lib/thirdparty/fmt/xchar.h rename to thirdparty/fmt/xchar.h diff --git a/lib/thirdparty/tabulate.hpp b/thirdparty/tabulate.hpp similarity index 100% rename from lib/thirdparty/tabulate.hpp rename to thirdparty/tabulate.hpp diff --git a/lib/thirdparty/tl/expected.hpp b/thirdparty/tl/expected.hpp similarity index 100% rename from lib/thirdparty/tl/expected.hpp rename to thirdparty/tl/expected.hpp diff --git a/lib/thirdparty/tl/optional.hpp b/thirdparty/tl/optional.hpp similarity index 100% rename from lib/thirdparty/tl/optional.hpp rename to thirdparty/tl/optional.hpp