From ee8419701472be9f24c51a41ee7b7ef3cf38f329 Mon Sep 17 00:00:00 2001
From: peterbell10 <peterbell10@live.co.uk>
Date: Wed, 29 Aug 2018 01:51:25 +0100
Subject: Force all headers other than "Globals.h" to be included with relative
 paths (#4269)

Closes #4236

CMake now creates a header file in the build directory under the path "include/Globals.h" which just includes "src/Globals.h" with an absolute path. Then instead of adding "src/" to the include directories, it adds "include/".

#include "Globals.h" still works by including the build generated file and any other src-relative path will not work.
---
 src/WorldStorage/CMakeLists.txt              | 3 ---
 src/WorldStorage/EnchantmentSerializer.cpp   | 2 +-
 src/WorldStorage/FireworksSerializer.cpp     | 2 +-
 src/WorldStorage/NBTChunkSerializer.h        | 2 +-
 src/WorldStorage/SchematicFileSerializer.cpp | 2 +-
 src/WorldStorage/WSSAnvil.cpp                | 4 ++--
 6 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/WorldStorage')

diff --git a/src/WorldStorage/CMakeLists.txt b/src/WorldStorage/CMakeLists.txt
index afb3ef179..a0875e351 100644
--- a/src/WorldStorage/CMakeLists.txt
+++ b/src/WorldStorage/CMakeLists.txt
@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	EnchantmentSerializer.cpp
diff --git a/src/WorldStorage/EnchantmentSerializer.cpp b/src/WorldStorage/EnchantmentSerializer.cpp
index 9f477f316..08db91115 100644
--- a/src/WorldStorage/EnchantmentSerializer.cpp
+++ b/src/WorldStorage/EnchantmentSerializer.cpp
@@ -2,8 +2,8 @@
 #include "Globals.h"
 
 #include "EnchantmentSerializer.h"
-#include "Enchantments.h"
 #include "FastNBT.h"
+#include "../Enchantments.h"
 
 void EnchantmentSerializer::WriteToNBTCompound(const cEnchantments & a_Enchantments, cFastNBTWriter & a_Writer, const AString & a_ListTagName)
 {
diff --git a/src/WorldStorage/FireworksSerializer.cpp b/src/WorldStorage/FireworksSerializer.cpp
index 91ef35544..891a67e62 100644
--- a/src/WorldStorage/FireworksSerializer.cpp
+++ b/src/WorldStorage/FireworksSerializer.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"
 #include "FireworksSerializer.h"
-#include "WorldStorage/FastNBT.h"
+#include "../WorldStorage/FastNBT.h"
 
 
 
diff --git a/src/WorldStorage/NBTChunkSerializer.h b/src/WorldStorage/NBTChunkSerializer.h
index 101384739..a7cb1de1e 100644
--- a/src/WorldStorage/NBTChunkSerializer.h
+++ b/src/WorldStorage/NBTChunkSerializer.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "ChunkDataCallback.h"
+#include "../ChunkDataCallback.h"
 
 
 
diff --git a/src/WorldStorage/SchematicFileSerializer.cpp b/src/WorldStorage/SchematicFileSerializer.cpp
index 37d5a0c77..655a9a686 100644
--- a/src/WorldStorage/SchematicFileSerializer.cpp
+++ b/src/WorldStorage/SchematicFileSerializer.cpp
@@ -5,10 +5,10 @@
 
 #include "Globals.h"
 
-#include "OSSupport/GZipFile.h"
 #include "FastNBT.h"
 #include "SchematicFileSerializer.h"
 #include "../StringCompression.h"
+#include "../OSSupport/GZipFile.h"
 
 
 
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index 30e90f536..db4af6032 100755
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -54,8 +54,8 @@
 #include "../Entities/Painting.h"
 
 #include "../Protocol/MojangAPI.h"
-#include "Server.h"
-#include "BoundingBox.h"
+#include "../Server.h"
+#include "../BoundingBox.h"
 
 
 
-- 
cgit v1.2.3