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/BlockEntities/BlockEntityWithItems.h | 2 +-
 src/BlockEntities/CMakeLists.txt         | 3 ---
 src/BlockEntities/EnderChestEntity.h     | 2 +-
 src/BlockEntities/FlowerPotEntity.h      | 2 +-
 src/BlockEntities/JukeboxEntity.cpp      | 2 +-
 src/BlockEntities/MobHeadEntity.h        | 4 ++--
 6 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/BlockEntities')

diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h
index 65fdf3c0d..f2455699a 100644
--- a/src/BlockEntities/BlockEntityWithItems.h
+++ b/src/BlockEntities/BlockEntityWithItems.h
@@ -12,7 +12,7 @@
 #include "BlockEntity.h"
 #include "../ItemGrid.h"
 #include "../UI/WindowOwner.h"
-#include "World.h"
+#include "../World.h"
 
 
 
diff --git a/src/BlockEntities/CMakeLists.txt b/src/BlockEntities/CMakeLists.txt
index f3d0beb55..859b845e6 100644
--- a/src/BlockEntities/CMakeLists.txt
+++ b/src/BlockEntities/CMakeLists.txt
@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	BeaconEntity.cpp
diff --git a/src/BlockEntities/EnderChestEntity.h b/src/BlockEntities/EnderChestEntity.h
index acd7bbdec..5cd327bb6 100644
--- a/src/BlockEntities/EnderChestEntity.h
+++ b/src/BlockEntities/EnderChestEntity.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "BlockEntity.h"
-#include "UI/WindowOwner.h"
+#include "../UI/WindowOwner.h"
 
 
 
diff --git a/src/BlockEntities/FlowerPotEntity.h b/src/BlockEntities/FlowerPotEntity.h
index 00ddc1442..cf31c7bdf 100644
--- a/src/BlockEntities/FlowerPotEntity.h
+++ b/src/BlockEntities/FlowerPotEntity.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "BlockEntity.h"
-#include "Item.h"
+#include "../Item.h"
 
 
 
diff --git a/src/BlockEntities/JukeboxEntity.cpp b/src/BlockEntities/JukeboxEntity.cpp
index df699b362..8b909adf4 100644
--- a/src/BlockEntities/JukeboxEntity.cpp
+++ b/src/BlockEntities/JukeboxEntity.cpp
@@ -5,7 +5,7 @@
 #include "../World.h"
 #include "../EffectID.h"
 #include "json/value.h"
-#include "Entities/Player.h"
+#include "../Entities/Player.h"
 
 
 
diff --git a/src/BlockEntities/MobHeadEntity.h b/src/BlockEntities/MobHeadEntity.h
index fe0ae71e4..8072000cd 100644
--- a/src/BlockEntities/MobHeadEntity.h
+++ b/src/BlockEntities/MobHeadEntity.h
@@ -9,8 +9,8 @@
 #pragma once
 
 #include "BlockEntity.h"
-#include "Defines.h"
-#include "UUID.h"
+#include "../Defines.h"
+#include "../UUID.h"
 
 
 
-- 
cgit v1.2.3