From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Date: Fri, 17 Dec 2021 09:37:21 +0000 (+0100)
Subject: Build against system-provided nlohmann/json
X-Git-Tag: archive/raspbian/0.22.0-1+rpi1~1^2^2^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=76a14589b16a0dedbdd5a4930347dddb9918ad37;p=giada.git

Build against system-provided nlohmann/json

Origin: Debian
Forwarded: no
Last-Update: 2020-04-02

Last-Update: 2020-04-02

Gbp-Pq: Name 04-system-json.patch
---

diff --git a/src/core/conf.cpp b/src/core/conf.cpp
index ed38bf8..08381e5 100644
--- a/src/core/conf.cpp
+++ b/src/core/conf.cpp
@@ -27,7 +27,7 @@
 #include "core/conf.h"
 #include "core/const.h"
 #include "core/types.h"
-#include "deps/json/single_include/nlohmann/json.hpp"
+#include "nlohmann/json.hpp"
 #include "utils/fs.h"
 #include "utils/log.h"
 #include <FL/Fl.H>
diff --git a/src/core/midiMapper.h b/src/core/midiMapper.h
index f8f2c13..3b78fa8 100644
--- a/src/core/midiMapper.h
+++ b/src/core/midiMapper.h
@@ -27,7 +27,7 @@
 #ifndef G_MIDIMAPPER_H
 #define G_MIDIMAPPER_H
 
-#include "deps/json/single_include/nlohmann/json.hpp"
+#include "nlohmann/json.hpp"
 #include <string>
 #include <vector>
 
diff --git a/src/core/patch.cpp b/src/core/patch.cpp
index 498b12f..6dd4b54 100644
--- a/src/core/patch.cpp
+++ b/src/core/patch.cpp
@@ -26,7 +26,7 @@
 
 #include "patch.h"
 #include "core/mixer.h"
-#include "deps/json/single_include/nlohmann/json.hpp"
+#include "nlohmann/json.hpp"
 #include "utils/log.h"
 #include "utils/math.h"
 #include <fstream>