Move world CLI include cpps to cmake.

world/CMakeLists.txt

@@ -6,6 +6,25 @@ set(world_sources
     client.cpp
     cliententry.cpp
     clientlist.cpp
+    cli/cli_database_concurrency.cpp
+    cli/cli_bots_enable.cpp
+    cli/cli_bots_disable.cpp
+    cli/cli_mercs_enable.cpp
+    cli/cli_mercs_disable.cpp
+    cli/cli_copy_character.cpp
+    cli/cli_database_updates.cpp
+    cli/cli_database_dump.cpp
+    cli/cli_database_get_schema.cpp
+    cli/cli_database_set_account_status.cpp
+    cli/cli_database_version.cpp
+    cli/cli_test.cpp
+    cli/cli_test_colors.cpp
+    cli/cli_test_expansion.cpp
+    cli/cli_test_repository.cpp
+    cli/cli_test_repository_2.cpp
+    cli/cli_test_string_benchmark.cpp
+    cli/cli_version.cpp
+    cli/cli_etl_get_settings.cpp
     console.cpp
     dynamic_zone.cpp
     dynamic_zone_manager.cpp
@@ -68,7 +87,29 @@ set(world_headers
     world_event_scheduler.h
     zonelist.h
     zoneserver.h
-    )
+)
+
+source_group(cli FILES
+    cli/cli_database_concurrency.cpp
+    cli/cli_bots_enable.cpp
+    cli/cli_bots_disable.cpp
+    cli/cli_mercs_enable.cpp
+    cli/cli_mercs_disable.cpp
+    cli/cli_copy_character.cpp
+    cli/cli_database_updates.cpp
+    cli/cli_database_dump.cpp
+    cli/cli_database_get_schema.cpp
+    cli/cli_database_set_account_status.cpp
+    cli/cli_database_version.cpp
+    cli/cli_test.cpp
+    cli/cli_test_colors.cpp
+    cli/cli_test_expansion.cpp
+    cli/cli_test_repository.cpp
+    cli/cli_test_repository_2.cpp
+    cli/cli_test_string_benchmark.cpp
+    cli/cli_version.cpp
+    cli/cli_etl_get_settings.cpp
+)
 
 add_executable(world ${world_sources} ${world_headers})
 

world/cli/cli_bots_disable.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../worlddb.h"
 #include "../../common/database_schema.h"
 

world/cli/cli_bots_enable.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../worlddb.h"
 #include "../../common/rulesys.h"
 

world/cli/cli_copy_character.cpp

@@ -1,3 +1,5 @@
+#include "../world_server_cli.h"
+#include "../../common/eqemu_logsys.h"
 #include "../../common/eqemu_logsys_log_aliases.h"
 #include "../worlddb.h"
 

world/cli/cli_database_concurrency.cpp

@@ -1,4 +1,5 @@
 #include <thread>
+#include "../world_server_cli.h"
 #include "../../common/repositories/zone_repository.h"
 #include "../../common/eqemu_config.h"
 #include <signal.h>

world/cli/cli_database_dump.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/database/database_dump_service.h"
 
 void WorldserverCLI::DatabaseDump(int argc, char **argv, argh::parser &cmd, std::string &description)

world/cli/cli_database_get_schema.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/database_schema.h"
 #include "../../common/json/json.h"
 

world/cli/cli_database_set_account_status.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../worlddb.h"
 
 void WorldserverCLI::DatabaseSetAccountStatus(int argc, char **argv, argh::parser &cmd, std::string &description)

world/cli/cli_database_updates.cpp

@@ -1,3 +1,5 @@
+#include "../world_server_cli.h"
+#include "../worlddb.h"
 #include "../../common/database/database_update.h"
 
 void WorldserverCLI::DatabaseUpdates(int argc, char **argv, argh::parser &cmd, std::string &description)

world/cli/cli_database_version.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/version.h"
 #include "../../common/json/json.h"
 #include "../../common/rulesys.h"

world/cli/cli_etl_get_settings.cpp

@@ -1,3 +1,5 @@
+#include "../world_server_cli.h"
+#include "../worlddb.h"
 #include "../../common/events/player_event_logs.h"
 #include "../../common/json/json.h"
 

world/cli/cli_mercs_disable.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../worlddb.h"
 #include "../../common/database_schema.h"
 

world/cli/cli_mercs_enable.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../worlddb.h"
 #include "../../common/database_schema.h"
 

world/cli/cli_test.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include <cereal/archives/json.hpp>
 #include <cereal/types/vector.hpp>
 #include <iomanip>

world/cli/cli_test_colors.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/zone_store.h"
 #include "../../common/termcolor/rang.hpp"
 

world/cli/cli_test_expansion.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/rulesys.h"
 #include "../../common/repositories/content_flags_repository.h"
 #include "../../common/content/world_content_service.h"

world/cli/cli_test_repository.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/repositories/instance_list_repository.h"
 #include "../worlddb.h"
 

world/cli/cli_test_repository_2.cpp

@@ -1,3 +1,5 @@
+#include "../world_server_cli.h"
+#include "../worlddb.h"
 #include "../../common/repositories/zone_repository.h"
 
 void WorldserverCLI::TestRepository2(int argc, char **argv, argh::parser &cmd, std::string &description)

world/cli/cli_test_string_benchmark.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include <cereal/archives/json.hpp>
 #include <cereal/types/vector.hpp>
 #include "../../common/events/player_events.h"

world/cli/cli_version.cpp

@@ -1,3 +1,4 @@
+#include "../world_server_cli.h"
 #include "../../common/json/json.h"
 #include "../../common/version.h"
 

world/world_server_cli.cpp

@@ -39,22 +39,3 @@ void WorldserverCLI::CommandHandler(int argc, char **argv)
 	EQEmuCommand::HandleMenu(function_map, cmd, argc, argv);
 }
 
-#include "cli/database_concurrency.cpp"
-#include "cli/bots_enable.cpp"
-#include "cli/bots_disable.cpp"
-#include "cli/mercs_enable.cpp"
-#include "cli/mercs_disable.cpp"
-#include "cli/copy_character.cpp"
-#include "cli/database_updates.cpp"
-#include "cli/database_dump.cpp"
-#include "cli/database_get_schema.cpp"
-#include "cli/database_set_account_status.cpp"
-#include "cli/database_version.cpp"
-#include "cli/test.cpp"
-#include "cli/test_colors.cpp"
-#include "cli/test_expansion.cpp"
-#include "cli/test_repository.cpp"
-#include "cli/test_repository_2.cpp"
-#include "cli/test_string_benchmark.cpp"
-#include "cli/version.cpp"
-#include "cli/etl_get_settings.cpp"