From aed1395c53989605ecbb97e385a1e091b98ddb7d Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Mon, 3 Jul 2023 22:45:01 +0300 Subject: [PATCH] lib/utils: update library paths --- lib/index/meson.build | 21 +++++++++++---------- lib/message/meson.build | 2 +- lib/thirdparty/fmt/{fmt => }/args.h | 0 lib/thirdparty/fmt/{fmt => }/chrono.h | 0 lib/thirdparty/fmt/{fmt => }/color.h | 0 lib/thirdparty/fmt/{fmt => }/compile.h | 0 lib/thirdparty/fmt/{fmt => }/core.h | 0 lib/thirdparty/fmt/{fmt => }/format-inl.h | 0 lib/thirdparty/fmt/{fmt => }/format.h | 0 lib/thirdparty/fmt/{fmt => }/os.h | 0 lib/thirdparty/fmt/{fmt => }/ostream.h | 0 lib/thirdparty/fmt/{fmt => }/printf.h | 0 lib/thirdparty/fmt/{fmt => }/ranges.h | 0 lib/thirdparty/fmt/{fmt => }/std.h | 0 lib/thirdparty/fmt/{fmt => }/xchar.h | 0 lib/utils/meson.build | 5 +++-- lib/utils/mu-option.hh | 2 +- lib/utils/mu-result.hh | 2 +- 18 files changed, 17 insertions(+), 15 deletions(-) rename lib/thirdparty/fmt/{fmt => }/args.h (100%) rename lib/thirdparty/fmt/{fmt => }/chrono.h (100%) rename lib/thirdparty/fmt/{fmt => }/color.h (100%) rename lib/thirdparty/fmt/{fmt => }/compile.h (100%) rename lib/thirdparty/fmt/{fmt => }/core.h (100%) rename lib/thirdparty/fmt/{fmt => }/format-inl.h (100%) rename lib/thirdparty/fmt/{fmt => }/format.h (100%) rename lib/thirdparty/fmt/{fmt => }/os.h (100%) rename lib/thirdparty/fmt/{fmt => }/ostream.h (100%) rename lib/thirdparty/fmt/{fmt => }/printf.h (100%) rename lib/thirdparty/fmt/{fmt => }/ranges.h (100%) rename lib/thirdparty/fmt/{fmt => }/std.h (100%) rename lib/thirdparty/fmt/{fmt => }/xchar.h (100%) diff --git a/lib/index/meson.build b/lib/index/meson.build index 26da2c3b..237adf62 100644 --- a/lib/index/meson.build +++ b/lib/index/meson.build @@ -15,22 +15,23 @@ ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. index_srcs=[ - 'mu-indexer.hh', - 'mu-indexer.cc', - 'mu-scanner.hh', - 'mu-scanner.cc' + 'mu-indexer.hh', + 'mu-indexer.cc', + 'mu-scanner.hh', + 'mu-scanner.cc' ] xapian_incs = xapian_dep.get_variable(pkgconfig: 'includedir') lib_mu_index_inc_dep = declare_dependency( include_directories: include_directories(['.', '..', xapian_incs])) lib_mu_index=static_library('mu-index', [index_srcs], - dependencies: [ - config_h_dep, - glib_dep, - lib_mu_index_inc_dep - ], - install: false) + dependencies: [ + config_h_dep, + glib_dep, + lib_mu_utils_dep, + lib_mu_index_inc_dep + ], + install: false) lib_mu_index_dep = declare_dependency( link_with: lib_mu_index diff --git a/lib/message/meson.build b/lib/message/meson.build index cab52eec..b1bc21b5 100644 --- a/lib/message/meson.build +++ b/lib/message/meson.build @@ -38,7 +38,7 @@ lib_mu_message=static_library( lib_mu_message_dep = declare_dependency( link_with: lib_mu_message, - dependencies: [ xapian_dep, gmime_dep ], + dependencies: [ xapian_dep, gmime_dep, lib_mu_utils_dep ], include_directories: include_directories(['.', '..'])) diff --git a/lib/thirdparty/fmt/fmt/args.h b/lib/thirdparty/fmt/args.h similarity index 100% rename from lib/thirdparty/fmt/fmt/args.h rename to lib/thirdparty/fmt/args.h diff --git a/lib/thirdparty/fmt/fmt/chrono.h b/lib/thirdparty/fmt/chrono.h similarity index 100% rename from lib/thirdparty/fmt/fmt/chrono.h rename to lib/thirdparty/fmt/chrono.h diff --git a/lib/thirdparty/fmt/fmt/color.h b/lib/thirdparty/fmt/color.h similarity index 100% rename from lib/thirdparty/fmt/fmt/color.h rename to lib/thirdparty/fmt/color.h diff --git a/lib/thirdparty/fmt/fmt/compile.h b/lib/thirdparty/fmt/compile.h similarity index 100% rename from lib/thirdparty/fmt/fmt/compile.h rename to lib/thirdparty/fmt/compile.h diff --git a/lib/thirdparty/fmt/fmt/core.h b/lib/thirdparty/fmt/core.h similarity index 100% rename from lib/thirdparty/fmt/fmt/core.h rename to lib/thirdparty/fmt/core.h diff --git a/lib/thirdparty/fmt/fmt/format-inl.h b/lib/thirdparty/fmt/format-inl.h similarity index 100% rename from lib/thirdparty/fmt/fmt/format-inl.h rename to lib/thirdparty/fmt/format-inl.h diff --git a/lib/thirdparty/fmt/fmt/format.h b/lib/thirdparty/fmt/format.h similarity index 100% rename from lib/thirdparty/fmt/fmt/format.h rename to lib/thirdparty/fmt/format.h diff --git a/lib/thirdparty/fmt/fmt/os.h b/lib/thirdparty/fmt/os.h similarity index 100% rename from lib/thirdparty/fmt/fmt/os.h rename to lib/thirdparty/fmt/os.h diff --git a/lib/thirdparty/fmt/fmt/ostream.h b/lib/thirdparty/fmt/ostream.h similarity index 100% rename from lib/thirdparty/fmt/fmt/ostream.h rename to lib/thirdparty/fmt/ostream.h diff --git a/lib/thirdparty/fmt/fmt/printf.h b/lib/thirdparty/fmt/printf.h similarity index 100% rename from lib/thirdparty/fmt/fmt/printf.h rename to lib/thirdparty/fmt/printf.h diff --git a/lib/thirdparty/fmt/fmt/ranges.h b/lib/thirdparty/fmt/ranges.h similarity index 100% rename from lib/thirdparty/fmt/fmt/ranges.h rename to lib/thirdparty/fmt/ranges.h diff --git a/lib/thirdparty/fmt/fmt/std.h b/lib/thirdparty/fmt/std.h similarity index 100% rename from lib/thirdparty/fmt/fmt/std.h rename to lib/thirdparty/fmt/std.h diff --git a/lib/thirdparty/fmt/fmt/xchar.h b/lib/thirdparty/fmt/xchar.h similarity index 100% rename from lib/thirdparty/fmt/fmt/xchar.h rename to lib/thirdparty/fmt/xchar.h diff --git a/lib/utils/meson.build b/lib/utils/meson.build index 453ddc1a..fd5b72ff 100644 --- a/lib/utils/meson.build +++ b/lib/utils/meson.build @@ -33,14 +33,14 @@ lib_mu_utils=static_library('mu-utils', [ readline_dep, cld2_dep ], include_directories: - include_directories(['.','..']), + 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/fmt']) + include_directories(['.', '..', '../thirdparty']) ) # @@ -80,5 +80,6 @@ test('test-lang-detector', executable('test-lang-detector', 'mu-lang-detector.cc', install: false, cpp_args: ['-DBUILD_TESTS'], + dependencies: [ config_h_dep, glib_dep, lib_mu_utils_dep ])) subdir('tests') diff --git a/lib/utils/mu-option.hh b/lib/utils/mu-option.hh index c2885486..3ca683e0 100644 --- a/lib/utils/mu-option.hh +++ b/lib/utils/mu-option.hh @@ -20,7 +20,7 @@ #ifndef MU_OPTION__ #define MU_OPTION__ -#include "thirdparty/optional.hpp" +#include #include namespace Mu { diff --git a/lib/utils/mu-result.hh b/lib/utils/mu-result.hh index 557102c3..02ca332f 100644 --- a/lib/utils/mu-result.hh +++ b/lib/utils/mu-result.hh @@ -20,7 +20,7 @@ #ifndef MU_RESULT_HH__ #define MU_RESULT_HH__ -#include "thirdparty/expected.hpp" +#include #include "utils/mu-error.hh" namespace Mu {