updated CMakeLists.txt and source files to the new include structure

pentatonick · Aug 3, 2024 · 0aa0632 · 0aa0632
1 parent ae14560
commit 0aa0632
Show file tree

Hide file tree

Showing 102 changed files with 83 additions and 137 deletions.
diff --git a/library/api/CMakeLists.txt b/library/api/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_api STATIC)
 # Public include headers
 target_include_directories(minecpp_api
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp
 )
 
 # Source subdirectory

diff --git a/library/api/src/nbt/block/Block.schema.cpp b/library/api/src/nbt/block/Block.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/block/Block.schema.h"
+#include <minecpp/nbt/block/Block.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::block {

diff --git a/library/api/src/nbt/block/BlockState.schema.cpp b/library/api/src/nbt/block/BlockState.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/block/BlockState.schema.h"
+#include <minecpp/nbt/block/BlockState.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::block {

diff --git a/library/api/src/nbt/chunk/Chunk.schema.cpp b/library/api/src/nbt/chunk/Chunk.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/chunk/Chunk.schema.h"
+#include <minecpp/nbt/chunk/Chunk.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::chunk {

diff --git a/library/api/src/nbt/common/Common.schema.cpp b/library/api/src/nbt/common/Common.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/common/Common.schema.h"
+#include <minecpp/nbt/common/Common.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::common {

diff --git a/library/api/src/nbt/item/Item.schema.cpp b/library/api/src/nbt/item/Item.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/item/Item.schema.h"
+#include <minecpp/nbt/item/Item.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::item {

diff --git a/library/api/src/nbt/level/Level.schema.cpp b/library/api/src/nbt/level/Level.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/level/Level.schema.h"
+#include <minecpp/nbt/level/Level.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::level {

diff --git a/library/api/src/nbt/player/Player.schema.cpp b/library/api/src/nbt/player/Player.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/player/Player.schema.h"
+#include <minecpp/nbt/player/Player.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::player {

diff --git a/library/api/src/nbt/repository/Biome.schema.cpp b/library/api/src/nbt/repository/Biome.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/repository/Biome.schema.h"
+#include <minecpp/nbt/repository/Biome.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::repository {

diff --git a/library/api/src/nbt/repository/Chat.schema.cpp b/library/api/src/nbt/repository/Chat.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/repository/Chat.schema.h"
+#include <minecpp/nbt/repository/Chat.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::repository {

diff --git a/library/api/src/nbt/repository/Damage.schema.cpp b/library/api/src/nbt/repository/Damage.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/repository/Damage.schema.h"
+#include <minecpp/nbt/repository/Damage.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::repository {

diff --git a/library/api/src/nbt/repository/Dimension.schema.cpp b/library/api/src/nbt/repository/Dimension.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/repository/Dimension.schema.h"
+#include <minecpp/nbt/repository/Dimension.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::repository {

diff --git a/library/api/src/nbt/repository/Registry.schema.cpp b/library/api/src/nbt/repository/Registry.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/repository/Registry.schema.h"
+#include <minecpp/nbt/repository/Registry.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::repository {

diff --git a/library/api/src/nbt/repository/Repository.schema.cpp b/library/api/src/nbt/repository/Repository.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/repository/Repository.schema.h"
+#include <minecpp/nbt/repository/Repository.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::repository {

diff --git a/library/api/src/nbt/repository/Trim.schema.cpp b/library/api/src/nbt/repository/Trim.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/repository/Trim.schema.h"
+#include <minecpp/nbt/repository/Trim.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::repository {

diff --git a/library/api/src/nbt/trace/Trace.schema.cpp b/library/api/src/nbt/trace/Trace.schema.cpp
@@ -1,4 +1,4 @@
-#include "nbt/trace/Trace.schema.h"
+#include <minecpp/nbt/trace/Trace.schema.h>
 #include <minecpp/nbt/Exception.h>
 
 namespace minecpp::nbt::trace {

diff --git a/library/api/src/net/Chunk.schema.cpp b/library/api/src/net/Chunk.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/Chunk.schema.h"
+#include <minecpp/net/Chunk.schema.h>
 #include <algorithm>
 
 namespace minecpp::net {

diff --git a/library/api/src/net/Common.schema.cpp b/library/api/src/net/Common.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/Common.schema.h"
+#include <minecpp/net/Common.schema.h>
 #include <algorithm>
 
 namespace minecpp::net {

diff --git a/library/api/src/net/engine/Clientbound.schema.cpp b/library/api/src/net/engine/Clientbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/engine/Clientbound.schema.h"
+#include <minecpp/net/engine/Clientbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::engine::cb {

diff --git a/library/api/src/net/engine/Serverbound.schema.cpp b/library/api/src/net/engine/Serverbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/engine/Serverbound.schema.h"
+#include <minecpp/net/engine/Serverbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::engine::sb {

diff --git a/library/api/src/net/login/Clientbound.schema.cpp b/library/api/src/net/login/Clientbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/login/Clientbound.schema.h"
+#include <minecpp/net/login/Clientbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::login::cb {

diff --git a/library/api/src/net/login/Serverbound.schema.cpp b/library/api/src/net/login/Serverbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/login/Serverbound.schema.h"
+#include <minecpp/net/login/Serverbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::login::sb {

diff --git a/library/api/src/net/play/Clientbound.schema.cpp b/library/api/src/net/play/Clientbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/play/Clientbound.schema.h"
+#include <minecpp/net/play/Clientbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::play::cb {

diff --git a/library/api/src/net/play/Common.schema.cpp b/library/api/src/net/play/Common.schema.cpp
@@ -1,4 +1,4 @@
-#include "net/play/Common.schema.h"
+#include <minecpp/net/play/Common.schema.h>
 #include "minecpp/network/NetworkUtil.h"
 #include <algorithm>
 

diff --git a/library/api/src/net/play/Serverbound.schema.cpp b/library/api/src/net/play/Serverbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/play/Serverbound.schema.h"
+#include <minecpp/net/play/Serverbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::play::sb {

diff --git a/library/api/src/net/status/Clientbound.schema.cpp b/library/api/src/net/status/Clientbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/status/Clientbound.schema.h"
+#include <minecpp/net/status/Clientbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::status::cb {

diff --git a/library/api/src/net/status/Serverbound.schema.cpp b/library/api/src/net/status/Serverbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/status/Serverbound.schema.h"
+#include <minecpp/net/status/Serverbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::status::sb {

diff --git a/library/api/src/net/storage/Clientbound.schema.cpp b/library/api/src/net/storage/Clientbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/storage/Clientbound.schema.h"
+#include <minecpp/net/storage/Clientbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::storage::cb {

diff --git a/library/api/src/net/storage/Serverbound.schema.cpp b/library/api/src/net/storage/Serverbound.schema.cpp
@@ -1,5 +1,5 @@
 #include "minecpp/network/NetworkUtil.h"
-#include "net/storage/Serverbound.schema.h"
+#include <minecpp/net/storage/Serverbound.schema.h>
 #include <algorithm>
 
 namespace minecpp::net::storage::sb {

diff --git a/library/chat/CMakeLists.txt b/library/chat/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_chat STATIC)
 # Public include headers
 target_include_directories(minecpp_chat
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/chat
 )
 
 # Source subdirectory

diff --git a/library/command/CMakeLists.txt b/library/command/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_command STATIC)
 # Public include headers
 target_include_directories(minecpp_command
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/command
 )
 
 # Source subdirectory

diff --git a/library/command/src/core/Core.cpp b/library/command/src/core/Core.cpp
@@ -1,18 +1,17 @@
-#include "core/Core.h"
-
-#include "CommandManager.h"
-#include "core/Cord.h"
-#include "core/DecimateBlocks.h"
-#include "core/Echo.h"
-#include "core/Fly.h"
-#include "core/Format.h"
-#include "core/Give.h"
-#include "core/KillAll.h"
-#include "core/ListEntities.h"
-#include "core/ReloadChunk.h"
-#include "core/Spawn.h"
-#include "core/Sync.h"
-#include "core/Teleport.h"
+#include <minecpp/command/core/Core.h>
+#include <minecpp/command/CommandManager.h>
+#include <minecpp/command/core/Cord.h>
+#include <minecpp/command/core/DecimateBlocks.h>
+#include <minecpp/command/core/Echo.h>
+#include <minecpp/command/core/Fly.h>
+#include <minecpp/command/core/Format.h>
+#include <minecpp/command/core/Give.h>
+#include <minecpp/command/core/KillAll.h>
+#include <minecpp/command/core/ListEntities.h>
+#include <minecpp/command/core/ReloadChunk.h>
+#include <minecpp/command/core/Spawn.h>
+#include <minecpp/command/core/Sync.h>
+#include <minecpp/command/core/Teleport.h>
 
 namespace minecpp::command::core {
 

diff --git a/library/command/src/core/DecimateBlocks.cpp b/library/command/src/core/DecimateBlocks.cpp
@@ -1,5 +1,5 @@
-#include "core/DecimateBlocks.h"
-#include "RuntimeContext.h"
+#include <minecpp/command/core/DecimateBlocks.h>
+#include <minecpp/command/RuntimeContext.h>
 
 #include "minecpp/entity/Aliases.hpp"
 #include "minecpp/entity/component/Abilities.h"

diff --git a/library/command/test/CMakeLists.txt b/library/command/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_command_test)
 # Public include headers
 target_include_directories(minecpp_command_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/command_test
 )
 
 # Source subdirectory

diff --git a/library/container/CMakeLists.txt b/library/container/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_container STATIC)
 # Public include headers
 target_include_directories(minecpp_container
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/container
 )
 
 # Source subdirectory

diff --git a/library/container/test/CMakeLists.txt b/library/container/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_container_test)
 # Public include headers
 target_include_directories(minecpp_container_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/container_test
 )
 
 # Source subdirectory

diff --git a/library/controller/CMakeLists.txt b/library/controller/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_controller STATIC)
 # Public include headers
 target_include_directories(minecpp_controller
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/controller
 )
 
 # Source subdirectory

diff --git a/library/controller/src/block/Block.cpp b/library/controller/src/block/Block.cpp
@@ -1,14 +1,14 @@
-#include "block/Block.h"
-#include "block/Door.h"
-#include "block/Fence.h"
-#include "block/Foliage.h"
-#include "block/Grass.h"
-#include "block/Slab.h"
-#include "block/Stairs.h"
-#include "block/Torch.h"
-#include "block/TrapDoor.h"
-#include "block/Wood.h"
-#include "BlockManager.h"
+#include <minecpp/controller/block/Block.h>
+#include <minecpp/controller/block/Door.h>
+#include <minecpp/controller/block/Fence.h>
+#include <minecpp/controller/block/Foliage.h>
+#include <minecpp/controller/block/Grass.h>
+#include <minecpp/controller/block/Slab.h>
+#include <minecpp/controller/block/Stairs.h>
+#include <minecpp/controller/block/Torch.h>
+#include <minecpp/controller/block/TrapDoor.h>
+#include <minecpp/controller/block/Wood.h>
+#include <minecpp/controller/BlockManager.h>
 #include "minecpp/repository/Block.h"
 #include <spdlog/spdlog.h>
 

diff --git a/library/controller/src/block/Foliage.cpp b/library/controller/src/block/Foliage.cpp
@@ -1,4 +1,4 @@
-#include "block/Foliage.h"
+#include <minecpp/controller/block/Foliage.h>
 
 #include "minecpp/world/BlockState.h"
 

diff --git a/library/controller/src/item/Item.cpp b/library/controller/src/item/Item.cpp
@@ -1,9 +1,9 @@
-#include "item/Item.h"
-#include "item/Bow.h"
-#include "item/Food.h"
-#include "item/Sword.h"
+#include <minecpp/controller/item/Item.h>
+#include <minecpp/controller/item/Bow.h>
+#include <minecpp/controller/item/Food.h>
+#include <minecpp/controller/item/Sword.h>
 #include "minecpp/repository/Item.h"
-#include "RootItem.h"
+#include <minecpp/controller/RootItem.h>
 
 namespace minecpp::controller::item {
 

diff --git a/library/crypto/CMakeLists.txt b/library/crypto/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_crypto STATIC)
 # Public include headers
 target_include_directories(minecpp_crypto
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/crypto
 )
 
 # Source subdirectory

diff --git a/library/crypto/test/CMakeLists.txt b/library/crypto/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_crypto_test)
 # Public include headers
 target_include_directories(minecpp_crypto_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/crypto_test
 )
 
 # Source subdirectory

diff --git a/library/debug/CMakeLists.txt b/library/debug/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_debug STATIC)
 # Public include headers
 target_include_directories(minecpp_debug
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/debug
 )
 
 # Source subdirectory

diff --git a/library/debug/src/TraceManager.cpp b/library/debug/src/TraceManager.cpp
@@ -1,4 +1,4 @@
-#include "TraceManager.h"
+#include <minecpp/debug/TraceManager.h>
 
 #include <cassert>
 

diff --git a/library/debug/test/CMakeLists.txt b/library/debug/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_debug_test)
 # Public include headers
 target_include_directories(minecpp_debug_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/debug_test
 )
 
 # Source subdirectory

diff --git a/library/entity/CMakeLists.txt b/library/entity/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_entity STATIC)
 # Public include headers
 target_include_directories(minecpp_entity
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/entity
 )
 
 # Source subdirectory

diff --git a/library/entity/test/CMakeLists.txt b/library/entity/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_entity_test)
 # Public include headers
 target_include_directories(minecpp_entity_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/entity_test
 )
 
 # Source subdirectory

diff --git a/library/format/CMakeLists.txt b/library/format/CMakeLists.txt
@@ -7,7 +7,6 @@ add_library(minecpp_format STATIC)
 # Public include headers
 target_include_directories(minecpp_format
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/format
 )
 
 # Source subdirectory

diff --git a/library/format/test/CMakeLists.txt b/library/format/test/CMakeLists.txt
@@ -7,7 +7,6 @@ add_executable(minecpp_format_test)
 # Public include headers
 target_include_directories(minecpp_format_test
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/minecpp/format_test
 )
 
 # Source subdirectory