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 cf8437dd8e6df14ec00b09d1da5b0420d12ffe9f..0f74545db17f408edeff23f68d86d1f904e1cbeb 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 f8f2c13f2e2f6c48a8fc364f61b1b7246887abe3..3b78fa867970eee8d22705c57298fe2b697bf990 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 498b12fbb320d04e5733dcbdaa831b53c150dfe5..6dd4b54346deb4ccb55d2b53b76308077080b502 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>