From 81eb149d8e55b73abdd04115eca9f61d108057c0 Mon Sep 17 00:00:00 2001 From: Mordred Date: Thu, 20 Sep 2018 23:31:38 +0200 Subject: [PATCH] Some cmake cleanups --- CMakeLists.txt | 17 +++++++------- src/servers/CMakeLists.txt | 12 ++-------- src/servers/Scripts/quest/ManFst001.cpp | 2 +- src/servers/Scripts/quest/ManFst002.cpp | 7 +++--- src/servers/sapphire_api/CMakeLists.txt | 1 - src/servers/sapphire_lobby/CMakeLists.txt | 1 - .../sapphire_zone/Action/ActionMount.cpp | 2 +- .../sapphire_zone/Action/ActionTeleport.cpp | 2 +- src/servers/sapphire_zone/Actor/BNpc.cpp | 2 +- src/servers/sapphire_zone/Actor/Chara.cpp | 3 ++- src/servers/sapphire_zone/Actor/Npc.cpp | 3 ++- src/servers/sapphire_zone/CMakeLists.txt | 22 ++----------------- .../Network/Handlers/EventHandlers.cpp | 2 +- 13 files changed, 24 insertions(+), 52 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b9b359a5..135f8516 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,15 +1,14 @@ -cmake_policy(SET CMP0014 NEW) -cmake_minimum_required(VERSION 3.0.2) -project (Sapphire) +cmake_policy( SET CMP0014 NEW ) +cmake_minimum_required( VERSION 3.0.2 ) +project( Sapphire ) -set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin) +set( CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin ) -set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin) -set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) -set(EXECUTABLE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) +set( EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin ) +set( LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin ) +set( EXECUTABLE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin ) -set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) +set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake ) ########################################################################## # Boost stuff diff --git a/src/servers/CMakeLists.txt b/src/servers/CMakeLists.txt index 28e43594..ea5a9774 100644 --- a/src/servers/CMakeLists.txt +++ b/src/servers/CMakeLists.txt @@ -1,13 +1,5 @@ -cmake_minimum_required(VERSION 2.6) -project (Sapphire) - -set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}) -set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}) - -set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include) - -include_directories("${PROJECT_INCLUDE_DIR}") -include_directories("${PROJECT_SOURCE_DIR}") +cmake_minimum_required( VERSION 3.0 ) +project( Sapphire ) add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_lobby) add_subdirectory(${PROJECT_SOURCE_DIR}/sapphire_api) diff --git a/src/servers/Scripts/quest/ManFst001.cpp b/src/servers/Scripts/quest/ManFst001.cpp index de98aeb5..53372d95 100644 --- a/src/servers/Scripts/quest/ManFst001.cpp +++ b/src/servers/Scripts/quest/ManFst001.cpp @@ -1,7 +1,7 @@ #include -#include #include #include "Event/EventHelper.h" +#include "Event/EventHandler.h" // Quest Script: ManFst001_00039 // Quest Name: Coming to Gridania diff --git a/src/servers/Scripts/quest/ManFst002.cpp b/src/servers/Scripts/quest/ManFst002.cpp index 93c6639c..831a4fca 100644 --- a/src/servers/Scripts/quest/ManFst002.cpp +++ b/src/servers/Scripts/quest/ManFst002.cpp @@ -1,7 +1,7 @@ #include -#include -#include "Event/EventHelper.h" #include +#include "Event/EventHandler.h" +#include "Event/EventHelper.h" // Quest Script: ManFst002_00124 // Quest Name: Close to Home @@ -9,8 +9,7 @@ // Start NPC: 1001140 // End NPC: 1000100 -class ManFst002 : - public EventScript +class ManFst002 : public EventScript { private: diff --git a/src/servers/sapphire_api/CMakeLists.txt b/src/servers/sapphire_api/CMakeLists.txt index fb32ceb0..429077df 100644 --- a/src/servers/sapphire_api/CMakeLists.txt +++ b/src/servers/sapphire_api/CMakeLists.txt @@ -5,7 +5,6 @@ project(Sapphire) file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*") file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*") -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/") add_executable(sapphire_api ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) set_target_properties(sapphire_api PROPERTIES diff --git a/src/servers/sapphire_lobby/CMakeLists.txt b/src/servers/sapphire_lobby/CMakeLists.txt index f937d857..aea65735 100644 --- a/src/servers/sapphire_lobby/CMakeLists.txt +++ b/src/servers/sapphire_lobby/CMakeLists.txt @@ -5,7 +5,6 @@ project(Sapphire) file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*") file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*") -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/") add_executable(sapphire_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) diff --git a/src/servers/sapphire_zone/Action/ActionMount.cpp b/src/servers/sapphire_zone/Action/ActionMount.cpp index 97822bd6..d5e75422 100644 --- a/src/servers/sapphire_zone/Action/ActionMount.cpp +++ b/src/servers/sapphire_zone/Action/ActionMount.cpp @@ -3,11 +3,11 @@ #include #include #include -#include #include "Network/PacketWrappers/ActorControlPacket142.h" #include "Network/PacketWrappers/ActorControlPacket143.h" #include "Network/PacketWrappers/ActorControlPacket144.h" +#include "Network/PacketWrappers/EffectPacket.h" #include "Actor/Player.h" #include "Script/ScriptMgr.h" diff --git a/src/servers/sapphire_zone/Action/ActionTeleport.cpp b/src/servers/sapphire_zone/Action/ActionTeleport.cpp index 91197f02..968b174b 100644 --- a/src/servers/sapphire_zone/Action/ActionTeleport.cpp +++ b/src/servers/sapphire_zone/Action/ActionTeleport.cpp @@ -2,11 +2,11 @@ #include #include #include -#include #include #include "Network/PacketWrappers/ActorControlPacket142.h" #include "Network/PacketWrappers/ActorControlPacket143.h" +#include "Network/PacketWrappers/EffectPacket.h" #include "Actor/Player.h" diff --git a/src/servers/sapphire_zone/Actor/BNpc.cpp b/src/servers/sapphire_zone/Actor/BNpc.cpp index 5e1c86aa..2461088e 100644 --- a/src/servers/sapphire_zone/Actor/BNpc.cpp +++ b/src/servers/sapphire_zone/Actor/BNpc.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include "Forwards.h" #include "Action/Action.h" diff --git a/src/servers/sapphire_zone/Actor/Chara.cpp b/src/servers/sapphire_zone/Actor/Chara.cpp index d736dba5..8d416786 100644 --- a/src/servers/sapphire_zone/Actor/Chara.cpp +++ b/src/servers/sapphire_zone/Actor/Chara.cpp @@ -4,7 +4,7 @@ #include #include #include -#include + #include "Forwards.h" #include "Action/Action.h" @@ -16,6 +16,7 @@ #include "Network/PacketWrappers/ActorControlPacket143.h" #include "Network/PacketWrappers/ActorControlPacket144.h" #include "Network/PacketWrappers/UpdateHpMpTpPacket.h" +#include "Network/PacketWrappers/EffectPacket.h" #include "StatusEffect/StatusEffect.h" #include "Action/ActionCollision.h" diff --git a/src/servers/sapphire_zone/Actor/Npc.cpp b/src/servers/sapphire_zone/Actor/Npc.cpp index 1f96dea6..b3a475f4 100644 --- a/src/servers/sapphire_zone/Actor/Npc.cpp +++ b/src/servers/sapphire_zone/Actor/Npc.cpp @@ -4,7 +4,7 @@ #include #include #include -#include + #include "Forwards.h" #include "Action/Action.h" @@ -16,6 +16,7 @@ #include "Network/PacketWrappers/ActorControlPacket143.h" #include "Network/PacketWrappers/ActorControlPacket144.h" #include "Network/PacketWrappers/UpdateHpMpTpPacket.h" +#include "Network/PacketWrappers/EffectPacket.h" #include "StatusEffect/StatusEffect.h" #include "Action/ActionCollision.h" diff --git a/src/servers/sapphire_zone/CMakeLists.txt b/src/servers/sapphire_zone/CMakeLists.txt index 9e4e7c0c..f3d02e5c 100644 --- a/src/servers/sapphire_zone/CMakeLists.txt +++ b/src/servers/sapphire_zone/CMakeLists.txt @@ -4,22 +4,6 @@ cmake_policy(SET CMP0014 OLD) project(sapphire_zone) -file(GLOB SERVER_PUBLIC_INCLUDE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - /*.h - Actor/*.h - Action/*.h - DebugCommand/*.h - Event/*.h - Inventory/*.h - Linkshell/*.h - Math/*.h - Network/*.h - Network/Handlers/*.h - Network/PacketWrappers/*.h - Script/*.h - StatusEffect/*.h - Zone/*.h) - file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.c* Actor/*.c* @@ -36,9 +20,7 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} StatusEffect/*.c* Zone/*.c*) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/") - -add_executable(sapphire_zone ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} ) +add_executable( sapphire_zone ${SERVER_SOURCE_FILES} ) set_target_properties(sapphire_zone PROPERTIES CXX_STANDARD 14 @@ -65,8 +47,8 @@ endif() target_link_libraries( sapphire_zone ${Boost_LIBRARIES} ) target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" ) -target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Script" ) target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external" ) + if (UNIX) cotire( sapphire_zone ) endif() diff --git a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp index 9298a673..f68943ce 100644 --- a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include "Network/GameConnection.h" @@ -17,6 +16,7 @@ #include "Script/ScriptMgr.h" +#include "Event/EventHandler.h" #include "Event/EventHelper.h" #include "Zone/InstanceContent.h"