From fdffbcdc0b0e63a6ba47d23b662cd992b4f4cede Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 1 Dec 2020 11:25:52 +0200 Subject: Use system libfmt libfmt is available on standard PC distros and on buildroot, so lets just use the system provided libfmt instead of a git submodule. Signed-off-by: Tomi Valkeinen --- .gitmodules | 3 --- .travis.yml | 1 + ext/fmt | 1 - meson.build | 4 +--- 4 files changed, 2 insertions(+), 7 deletions(-) delete mode 160000 ext/fmt diff --git a/.gitmodules b/.gitmodules index 6ac367e..c6d1083 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "ext/pybind11"] path = ext/pybind11 url = https://github.com/pybind/pybind11.git -[submodule "ext/fmt"] - path = ext/fmt - url = https://github.com/fmtlib/fmt.git diff --git a/.travis.yml b/.travis.yml index a487fc3..b311750 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ addons: - libevdev-dev - meson - ninja-build + - libfmt-dev # Need MYCC and MYCXX as travis overwrites CC and CXX diff --git a/ext/fmt b/ext/fmt deleted file mode 160000 index 7512a55..0000000 --- a/ext/fmt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7512a55aa3ae309587ca89668ef9ec4074a51a1f diff --git a/meson.build b/meson.build index 9652009..8db870c 100644 --- a/meson.build +++ b/meson.build @@ -31,9 +31,7 @@ endif add_global_link_arguments(link_arguments, language : 'cpp') -libfmt_includes = include_directories('ext/fmt/include') -libfmt_dep = declare_dependency(include_directories : libfmt_includes, - compile_args : '-DFMT_HEADER_ONLY') +libfmt_dep = dependency('fmt') pybind11_includes = include_directories('ext/pybind11/include') pybind11_dep = declare_dependency(include_directories : pybind11_includes) -- cgit v1.2.3