Use the canonical #include location for json.hpp (google#55)

use the canonical #include location for json.hpp

Author: cebtenzzre

CMakeLists.txt

@@ -91,7 +91,6 @@ message(STATUS "${fuzztest_BINARY_DIR}: ${${fuzztest_BINARY_DIR}}")
 include_directories(
     include/minja
     ${json_SOURCE_DIR}/include
-    ${json_SOURCE_DIR}/include/nlohmann
 )
 
 add_subdirectory(examples)

README.md

@@ -31,7 +31,7 @@ It is **not general purpose**: it includes just what’s needed for actual chat
 
 ## Usage:
 
-This library is header-only: just copy the header(s) you need, make sure to use a compiler that handles C++17 and you're done. Oh, and get [nlohmann::json](https://github.com/nlohmann/json)'s `json.hpp` in your include path.
+This library is header-only: just copy the header(s) you need, make sure to use a compiler that handles C++17 and you're done. Oh, and get [nlohmann::json](https://github.com/nlohmann/json) in your include path.
 
 See API in [minja/minja.hpp](./include/minja/minja.hpp) and [minja/chat-template.hpp](./include/minja/chat-template.hpp) (experimental).
 

include/minja/chat-template.hpp

@@ -9,10 +9,12 @@
 #pragma once
 
 #include "minja.hpp"
-#include <json.hpp>
+
 #include <string>
 #include <vector>
 
+#include <nlohmann/json.hpp>
+
 using json = nlohmann::ordered_json;
 
 namespace minja {

include/minja/minja.hpp

@@ -16,7 +16,8 @@
 #include <stdexcept>
 #include <sstream>
 #include <unordered_set>
-#include <json.hpp>
+
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::ordered_json;