summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rw-r--r--.travis.yml1
m---------ext/fmt0
-rw-r--r--meson.build4
4 files changed, 2 insertions, 6 deletions
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
-Subproject 7512a55aa3ae309587ca89668ef9ec4074a51a1
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)