Update JSON for Modern C++ to version 3

* configure.ac: search for new json.hpp version 3 * update also json.hpp copy to v3.6.1
vslavik · Apr 21, 2019 · 2bea91e · 2bea91e
1 parent 94c451c
commit 2bea91e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -11,7 +11,7 @@ dist_metainfo_DATA = net.poedit.Poedit.appdata.xml
 
 EXTRA_DIST = \
 	deps/json/LICENSE.MIT \
-	deps/json/src/json.hpp \
+	deps/json/single_include/nlohmann/json.hpp \
 	deps/pugixml/LICENSE.md \
 	deps/pugixml/src/pugiconfig.hpp \
 	deps/pugixml/src/pugixml.cpp \

diff --git a/configure.ac b/configure.ac
@@ -118,7 +118,7 @@ AS_IF([test "x$have_cpprest" = "xyes"],
       ])
 AM_CONDITIONAL([HAVE_CPPREST], [test "x$have_cpprest" != "xno"])
 
-AC_CHECK_HEADERS([json.hpp])
+AC_CHECK_HEADERS([nlohmann/json.hpp])
 
 WX_CONFIG_CHECK([3.0.3], [WXFOUND=1], [WXFOUND=0], [$WXLIBS_USED], [--unicode])
 

diff --git a/deps/json b/deps/json
diff --git a/src/json.h b/src/json.h
@@ -28,10 +28,10 @@
 
 #include "str_helpers.h"
 
-#ifdef HAVE_JSON_HPP
-#include <json.hpp>
+#ifdef HAVE_NLOHMANN_JSON_HPP
+ #include <nlohmann/json.hpp>
 #else
-#include "../deps/json/src/json.hpp"
+ #include "../deps/json/single_include/nlohmann/json.hpp"
 #endif
 
 using json = nlohmann::json;