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 7240433c01cb1ae77ca7446267130ce4478ec3f4..dd3167b00e8a8b2c44d70110c4561402a068c0b6 100644 (file)
--- 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 694ffe5257f4dd95d624082e168bb9faf8d4c293..3596e196c5e3c1accececad19a5dbf9fd508855d 100644 (file)
--- 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 2db30e4d71bf6a3918d7f006d494c8164b6d4248..95041afdf780ce0ba732b1cd81ab888a852ffd14 100644 (file)
--- 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>