event/systemd/meson.build: use nlohmann_json_dep

CM4all · Nov 3, 2023 · e8b163a · e8b163a
1 parent fa11dc6
commit e8b163a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/event/systemd/ResolvedClient.cxx b/src/event/systemd/ResolvedClient.cxx
@@ -16,7 +16,6 @@
 #include "util/Cancellable.hxx"
 #include "util/SpanCast.hxx"
 
-#define JSON_NO_IO
 #include <nlohmann/json.hpp>
 using json = nlohmann::json;
 

diff --git a/src/event/systemd/meson.build b/src/event/systemd/meson.build
@@ -1,12 +1,9 @@
 event_systemd_sources = []
 event_systemd_dependencies = []
 
-nlohmann_json = dependency('nlohmann_json',
-                           version: '>= 3.11',
-                           required: get_variable('libcommon_enable_json', false))
-if nlohmann_json.found()
+if is_variable('nlohmann_json_dep') and nlohmann_json_dep.found()
   event_systemd_sources += 'ResolvedClient.cxx'
-  event_systemd_dependencies += nlohmann_json
+  event_systemd_dependencies += nlohmann_json_dep
 endif
 
 event_systemd = static_library(