Move json.h (JSON for Modern C++) to include/nlohmann

src/bnetd/CMakeLists.txt

@@ -34,7 +34,6 @@ set(BNETD_SOURCES
 	luaobjects.cpp luaobjects.h luawrapper.cpp luawrapper.h
 	i18n.cpp i18n.h userlog.cpp userlog.h
 	../win32/winmain.cpp ../win32/winmain.h
-	../json/json.hpp
 	)
 	
 set(BNETD_CONSOLE_RESOURCES
@@ -51,6 +50,8 @@ endif(WITH_WIN32_GUI)
 
 target_include_directories(bnetd
     PRIVATE
+		$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/>
+		$<INSTALL_INTERFACE:include/>
 		${ZLIB_INCLUDE_DIRS}
 		${CURL_INCLUDE_DIRS}
 		${LUA_INCLUDE_DIR}

src/bnetd/adbanner.cpp

@@ -29,7 +29,7 @@
 #include <vector>
 
 #include "i18n.h"
-#include "json/json.hpp"
+#include <nlohmann/json.hpp>
 
 #include "common/bn_type.h"
 #include "common/tag.h"

src/bnetd/topic.cpp

@@ -27,7 +27,7 @@
 #include <utility>
 
 #include <optional.hpp>
-#include "json/json.hpp"
+#include <nlohmann/json.hpp>
 
 #include "compat/strcasecmp.h"
 

src/bnetd/versioncheck.cpp

@@ -39,7 +39,7 @@
 #include <unordered_map>
 
 #include <fmt/format.h>
-#include "json/json.hpp"
+#include <nlohmann/json.hpp>
 
 #include "common/eventlog.h"
 #include "common/field_sizes.h"