From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Date: Thu, 2 Apr 2020 13:19:12 +0000 (+0200)
Subject: Build against system-provided nlohmann/json
X-Git-Tag: archive/raspbian/0.16.2.2+ds1-1+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9c9ca22648c318a1be89a1acbc5f58e7c792d14a;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 7d8b000..31e5fcc 100644
--- a/src/core/conf.cpp
+++ b/src/core/conf.cpp
@@ -29,7 +29,7 @@
 #include <cassert>
 #include <string>
 #include <FL/Fl.H>
-#include "deps/json/single_include/nlohmann/json.hpp"
+#include "nlohmann/json.hpp"
 #include "utils/fs.h"
 #include "utils/log.h"
 #include "core/const.h"
@@ -314,4 +314,4 @@ bool write()
     ofs << j;
 	return true;
 }
-}}}; // giada::m::conf::
\ No newline at end of file
+}}}; // giada::m::conf::
diff --git a/src/core/init.cpp b/src/core/init.cpp
index d43a561..80e495d 100644
--- a/src/core/init.cpp
+++ b/src/core/init.cpp
@@ -35,7 +35,7 @@
 	#include <X11/Xlib.h> // For XInitThreads
 #endif
 #include <FL/Fl.H>
-#include "deps/json/single_include/nlohmann/json.hpp"
+#include "nlohmann/json.hpp"
 #include "gui/updater.h"
 #include "utils/log.h"
 #include "utils/fs.h"
diff --git a/src/core/midiMapConf.cpp b/src/core/midiMapConf.cpp
index fa4efc7..fcf55bd 100644
--- a/src/core/midiMapConf.cpp
+++ b/src/core/midiMapConf.cpp
@@ -30,7 +30,7 @@
 #include <string>
 #include <cstring>
 #include <dirent.h>
-#include "deps/json/single_include/nlohmann/json.hpp"
+#include "nlohmann/json.hpp"
 #include "utils/string.h"
 #include "utils/log.h"
 #include "utils/fs.h"
diff --git a/src/core/patch.cpp b/src/core/patch.cpp
index 671d7cf..09d529a 100644
--- a/src/core/patch.cpp
+++ b/src/core/patch.cpp
@@ -26,7 +26,7 @@
 
 
 #include <fstream>
-#include "deps/json/single_include/nlohmann/json.hpp"
+#include "nlohmann/json.hpp"
 #include "utils/math.h"
 #include "utils/log.h"
 #include "core/mixer.h"