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 7d8b000f1d31a77fb7d63d31841d13d8299e4139..31e5fcc4f2771b2c37b0b923de2ca9b514c0af77 100644 (file)
--- 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 d43a5612907bd8ca50dccaa6dd5ae00af60796ff..80e495de94baa68dae193ad95586933da5c7e53b 100644 (file)
--- 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 fa4efc7bdfc4818e4bb8df03e64e457d23594791..fcf55bd496d0282cb11a7539646885ee8bcd74da 100644 (file)
--- 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 671d7cf540a7ef210a99af7e36d13d46d077a913..09d529ade2c03c758aa798c2e60c16cd6ea8e392 100644 (file)
--- 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"