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 <[email protected]>
tomba · Dec 16, 2020 · fdffbcd · fdffbcd
1 parent 9f3e290
commit fdffbcd
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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
diff --git 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)