fix include paths for default build

mirostauder · mirostauder · commit 3c3dddbb9993 · 2025-10-22T07:11:51.000Z
diff --git a/include/Base_HostGroups_Manager.h b/include/Base_HostGroups_Manager.h
@@ -34,7 +34,7 @@ class PgSQL_SrvList;
 
 #ifndef PROXYJSON
 #define PROXYJSON
-#include "../deps/json/json_fwd.hpp"
+#include "nlohmann/json_fwd.hpp"
 #endif // PROXYJSON
 
 #include <variant>
diff --git a/include/Base_Session.h b/include/Base_Session.h
@@ -10,7 +10,7 @@
 
 #ifndef PROXYJSON
 #define PROXYJSON
-#include "../deps/json/json_fwd.hpp"
+#include "nlohmann/json_fwd.hpp"
 #endif // PROXYJSON
 
 class MySQL_STMTs_meta;
diff --git a/include/MySQL_Data_Stream.h b/include/MySQL_Data_Stream.h
@@ -9,7 +9,7 @@
 
 #ifndef PROXYJSON
 #define PROXYJSON
-#include "../deps/json/json_fwd.hpp"
+#include "nlohmann/json_fwd.hpp"
 #endif // PROXYJSON
 
 #ifndef uchar
diff --git a/include/MySQL_HostGroups_Manager.h b/include/MySQL_HostGroups_Manager.h
@@ -25,7 +25,7 @@
 
 #ifndef PROXYJSON
 #define PROXYJSON
-#include "../deps/json/json_fwd.hpp"
+#include "nlohmann/json_fwd.hpp"
 #endif // PROXYJSON
 
 #ifdef DEBUG
diff --git a/include/MySQL_Logger.hpp b/include/MySQL_Logger.hpp
@@ -6,7 +6,7 @@
 
 #ifndef PROXYJSON
 #define PROXYJSON
-#include "../deps/json/json_fwd.hpp"
+#include "nlohmann/json_fwd.hpp"
 #endif // PROXYJSON
 
 #define PROXYSQL_LOGGER_PTHREAD_MUTEX
diff --git a/include/MySQL_Session.h b/include/MySQL_Session.h
@@ -17,7 +17,7 @@
 
 #ifndef PROXYJSON
 #define PROXYJSON
-#include "../deps/json/json_fwd.hpp"
+#include "nlohmann/json_fwd.hpp"
 #endif // PROXYJSON
 
 extern class MySQL_Variables mysql_variables;
diff --git a/include/PgSQL_Connection.h b/include/PgSQL_Connection.h
@@ -7,7 +7,7 @@
 
 #ifndef PROXYJSON
 #define PROXYJSON
-#include "../deps/json/json_fwd.hpp"
+#include "nlohmann/json_fwd.hpp"
 #endif // PROXYJSON
 
 class PgSQL_SrvC;
diff --git a/include/PgSQL_ExplicitTxnStateMgr.h b/include/PgSQL_ExplicitTxnStateMgr.h
@@ -9,7 +9,7 @@
 
 #ifndef PROXYJSON
 #define PROXYJSON
-#include "../deps/json/json_fwd.hpp"
+#include "nlohmann/json_fwd.hpp"
 #endif // PROXYJSON
 
 /**
diff --git a/include/PgSQL_HostGroups_Manager.h b/include/PgSQL_HostGroups_Manager.h
@@ -25,7 +25,7 @@
 
 #ifndef PROXYJSON
 #define PROXYJSON
-#include "../deps/json/json_fwd.hpp"
+#include "nlohmann/json_fwd.hpp"
 #endif // PROXYJSON
 
 #ifdef DEBUG
diff --git a/include/PgSQL_Session.h b/include/PgSQL_Session.h
@@ -23,7 +23,7 @@ class PgSQL_Execute_Message;
 
 #ifndef PROXYJSON
 #define PROXYJSON
-#include "../deps/json/json_fwd.hpp"
+#include "nlohmann/json_fwd.hpp"
 #endif // PROXYJSON
 
 extern class PgSQL_Variables pgsql_variables;
diff --git a/include/mysql_connection.h b/include/mysql_connection.h
@@ -4,12 +4,12 @@
 #include "proxysql.h"
 #include "cpp.h"
 
-//#include "../deps/json/json.hpp"
+//#include "nlohmann/json.hpp"
 //using json = nlohmann::json;
 
 #ifndef PROXYJSON
 #define PROXYJSON
-#include "../deps/json/json_fwd.hpp"
+#include "nlohmann/json_fwd.hpp"
 #endif // PROXYJSON
 
 //#define STATUS_MYSQL_CONNECTION_TRANSACTION          0x00000001 // DEPRECATED
diff --git a/include/proxysql_utils.h b/include/proxysql_utils.h
@@ -13,7 +13,7 @@
 #include <sys/resource.h>
 #include <assert.h>
 
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 
 #ifndef ProxySQL_Checksum_Value_LENGTH
 #define ProxySQL_Checksum_Value_LENGTH 20
diff --git a/include/query_processor.h b/include/query_processor.h
@@ -10,11 +10,11 @@
 #define DIGEST_STATS_FAST_MINSIZE   100000
 #define DIGEST_STATS_FAST_THREADS   4
 
-//#include "../deps/json/json.hpp"
+//#include "nlohmann/json.hpp"
 
 #ifndef PROXYJSON
 #define PROXYJSON
-#include "../deps/json/json_fwd.hpp"
+#include "nlohmann/json_fwd.hpp"
 #endif // PROXYJSON
 
 #include "khash.h"
diff --git a/lib/Admin_Bootstrap.cpp b/lib/Admin_Bootstrap.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/Admin_FlushVariables.cpp b/lib/Admin_FlushVariables.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/Admin_Handler.cpp b/lib/Admin_Handler.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/BaseHGC.cpp b/lib/BaseHGC.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/Base_HostGroups_Manager.cpp b/lib/Base_HostGroups_Manager.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/Base_Session.cpp b/lib/Base_Session.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/MyHGC.cpp b/lib/MyHGC.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/MySQL_Authentication.cpp b/lib/MySQL_Authentication.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 //using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/MySQL_HostGroups_Manager.cpp b/lib/MySQL_HostGroups_Manager.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/MySQL_Logger.cpp b/lib/MySQL_Logger.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/MySQL_Monitor.cpp b/lib/MySQL_Monitor.cpp
@@ -8,7 +8,7 @@
 		* original implementation
 */
 
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/MySQL_Protocol.cpp b/lib/MySQL_Protocol.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/MySQL_Query_Processor.cpp b/lib/MySQL_Query_Processor.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/MySQL_Thread.cpp b/lib/MySQL_Thread.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/PgSQL_Authentication.cpp b/lib/PgSQL_Authentication.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/PgSQL_Connection.cpp b/lib/PgSQL_Connection.cpp
@@ -3,7 +3,7 @@
 #include <sstream>
 #include <atomic>
 
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 #include "PgSQL_HostGroups_Manager.h"
diff --git a/lib/PgSQL_Error_Helper.cpp b/lib/PgSQL_Error_Helper.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/PgSQL_HostGroups_Manager.cpp b/lib/PgSQL_HostGroups_Manager.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/PgSQL_Logger.cpp b/lib/PgSQL_Logger.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/PgSQL_Query_Processor.cpp b/lib/PgSQL_Query_Processor.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/PgSQL_Session.cpp b/lib/PgSQL_Session.cpp
@@ -1,4 +1,4 @@
-﻿#include "../deps/json/json.hpp"
+﻿#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 #include <variant>
diff --git a/lib/PgSQL_Thread.cpp b/lib/PgSQL_Thread.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/ProxySQL_Admin.cpp b/lib/ProxySQL_Admin.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/ProxySQL_RESTAPI_Server.cpp b/lib/ProxySQL_RESTAPI_Server.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/Query_Processor.cpp b/lib/Query_Processor.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/mysql_connection.cpp b/lib/mysql_connection.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/lib/mysql_data_stream.cpp b/lib/mysql_data_stream.cpp
@@ -1,4 +1,4 @@
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,6 +1,6 @@
 #define MAIN_PROXY_SQLITE3
 
-#include "../deps/json/json.hpp"
+#include "nlohmann/json.hpp"
 using json = nlohmann::json;
 #define PROXYJSON
 
