alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fmt: prefer system package if found

Browse Source 
mu embeds a "vendored" subset of the libfmt package under thirdparty; but it's
better to use the system-package if the user has one.

So, use the system package if found or user -Duse-embedded-fmt=true is
specified.
This commit is contained in:
Dirk-Jan C. Binnema
2025-07-19 09:31:16 +03:00
parent f90839b48b
commit 33958cd0f7
20 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/utils/meson.build
View File

@ -1,4 +1,4 @@
## Copyright (C) 2022-2023 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
## Copyright (C) 2022-2025 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@ -41,14 +41,15 @@ lib_mu_utils=static_library('mu-utils',
gio_unix_dep,
config_h_dep,
readline_dep,
cld2_dep
cld2_dep,
fmt_dep
], include_directories:
include_directories(['.', '..', thirdparty]),
install: false)
lib_mu_utils_dep = declare_dependency(
link_with: lib_mu_utils,
compile_args: '-DFMT_HEADER_ONLY',
dependencies: [fmt_dep],
include_directories:
include_directories(['.', '..', thirdparty]))

6
lib/utils/mu-error.hh
View File

@ -1,5 +1,5 @@
/*
** Copyright (C) 2019-2023 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
** Copyright (C) 2019-2025 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
**
** This program is free software; you can redistribute it and/or modify it
** under the terms of the GNU General Public License as published by the
@ -28,10 +28,6 @@
#include "mu-utils.hh"
#include <glib.h>
#ifndef FMT_HEADER_ONLY
#define FMT_HEADER_ONLY
#endif
#include <fmt/format.h>
#include <fmt/core.h>

5
lib/utils/mu-utils.hh
View File

@ -1,5 +1,5 @@
/*
** Copyright (C) 2020-2023 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
** Copyright (C) 2020-2025 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
**
** This library is free software; you can redistribute it and/or
** modify it under the terms of the GNU Lesser General Public License
@ -36,9 +36,6 @@
#include "mu-option.hh"
#ifndef FMT_HEADER_ONLY
#define FMT_HEADER_ONLY
#endif /*FMT_HEADER_ONLY*/
#include <fmt/format.h>
#include <fmt/core.h>
#include <fmt/chrono.h>