Build against system-provided nlohmann/json

Origin: Debian
Forwarded: no
Last-Update: 2022-06-14

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f849e3852d8786eaee4779a61371a0c9b4bfcbdb..10aa3bf86dba6969dfd5e066459635b7c770335f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -405,10 +405,10 @@ list(APPEND LIBRARIES fmt::fmt)
 
 # nlohmann_json (embedded as git submodule)
 
-set(JSON_Install OFF CACHE INTERNAL "") # No need to install it
-set(JSON_BuildTests OFF CACHE INTERNAL "") # Don't build tests
-add_subdirectory(src/deps/json)
-list(APPEND LIBRARIES nlohmann_json::nlohmann_json)
+#set(JSON_Install OFF CACHE INTERNAL "") # No need to install it
+#set(JSON_BuildTests OFF CACHE INTERNAL "") # Don't build tests
+#add_subdirectory(src/deps/json)
+#list(APPEND LIBRARIES nlohmann_json::nlohmann_json)
 
 # Catch (if tests enabled)
 

diff --git a/src/core/conf.cpp b/src/core/conf.cpp
index 462e514d1343496c65ba387e18344be99a06e510..a7fe3c0ad34ff21814191a31e525a889bad45ab7 100644 (file)
--- a/src/core/conf.cpp
+++ b/src/core/conf.cpp
@@ -32,7 +32,7 @@
 #include <FL/Fl.H>
 #include <cassert>
 #include <fstream>
-#include <nlohmann/json.hpp>
+#include "nlohmann/json.hpp"
 #include <string>
 
 namespace nl = nlohmann;
@@ -303,4 +303,4 @@ void Conf::sanitize()
        data.midiPortOut = std::max(-1, data.midiPortOut);
        data.midiPortIn  = std::max(-1, data.midiPortIn);
 }
-} // namespace giada::m
\ No newline at end of file
+} // namespace giada::m

diff --git a/src/core/midiMapper.h b/src/core/midiMapper.h
index 8bcd89028e8ce4cbc17ca807fd328203e486750f..e19c39b9adbfe09eb6035266a95e3068520ad4c0 100644 (file)
--- a/src/core/midiMapper.h
+++ b/src/core/midiMapper.h
@@ -28,7 +28,7 @@
 #define G_MIDIMAPPER_H
 
 #include "mapper.h"
-#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 bfeb64c23cb9de36b96f9cf318767292905a02e1..fd28dc3565ec13daff515bd51dabb4a2a7c49bb3 100644 (file)
--- a/src/core/patch.cpp
+++ b/src/core/patch.cpp
@@ -29,7 +29,7 @@
 #include "utils/log.h"
 #include "utils/math.h"
 #include <fstream>
-#include <nlohmann/json.hpp>
+#include "nlohmann/json.hpp"
 
 namespace nl = nlohmann;
 

diff --git a/src/gui/langMapper.h b/src/gui/langMapper.h
index 48f90cd790e29a89e93b68bb5e1ce9503e178ebf..c78a37b5af338d19228e0cfa4a6cc172dcdf23b7 100644 (file)
--- a/src/gui/langMapper.h
+++ b/src/gui/langMapper.h
@@ -28,7 +28,7 @@
 #define G_LANGMAPPER_H
 
 #include "mapper.h"
-#include <nlohmann/json.hpp>
+#include "nlohmann/json.hpp"
 #include <string>
 #include <unordered_map>
 #include <vector>

diff --git a/src/mapper.h b/src/mapper.h
index c22f13ff960e82b3425c89572c7d1594480a084e..b5e720d8db44e408fdc34bc71919143f3041006e 100644 (file)
--- a/src/mapper.h
+++ b/src/mapper.h
@@ -27,7 +27,7 @@
 #ifndef G_MAPPER_H
 #define G_MAPPER_H
 
-#include <nlohmann/json.hpp>
+#include "nlohmann/json.hpp"
 #include <optional>
 #include <string>
 #include <vector>