Rename json->nlohmann for consistency with standard use of 3rd party …

…lib (#251) Co-authored-by: Fædon Jóhannes Sinis <fs@treble.tech>
nmwsharp · Mar 3, 2024 · 14556d6 · 14556d6
1 parent a9a6c05
commit 14556d6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/deps/json/include/json/json.hpp → deps/json/include/nlohmann/json.hpp b/deps/json/include/json/json.hpp → deps/json/include/nlohmann/json.hpp
diff --git a/examples/demo-app/demo_app.cpp b/examples/demo-app/demo_app.cpp
@@ -24,7 +24,7 @@
 
 #include "args/args.hxx"
 #include "happly.h"
-#include "json/json.hpp"
+#include "nlohmann/json.hpp"
 
 #include "simple_dot_mesh_parser.h"
 #include "surface_mesh_io.h"

diff --git a/src/polyscope.cpp b/src/polyscope.cpp
@@ -16,7 +16,7 @@
 
 #include "stb_image.h"
 
-#include "json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 
 #include "backends/imgui_impl_opengl3.h"

diff --git a/src/view.cpp b/src/view.cpp
@@ -7,7 +7,7 @@
 
 #include "imgui.h"
 
-#include "json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 
 namespace polyscope {