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/Bindings/CMakeLists.txt                 | 4 ----
 src/Bindings/LuaWindow.cpp                  | 4 ++--
 src/Bindings/ManualBindings_RankManager.cpp | 4 ++--
 src/Bindings/Plugin.h                       | 2 +-
 src/Bindings/PluginManager.h                | 4 ++--
 5 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'src/Bindings')

diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt
index 2d1d4d57c..b1a19beca 100644
--- a/src/Bindings/CMakeLists.txt
+++ b/src/Bindings/CMakeLists.txt
@@ -1,7 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
-include_directories (".")
 
 SET (SRCS
 	Bindings.cpp
diff --git a/src/Bindings/LuaWindow.cpp b/src/Bindings/LuaWindow.cpp
index ae390e576..f19e9ab7c 100644
--- a/src/Bindings/LuaWindow.cpp
+++ b/src/Bindings/LuaWindow.cpp
@@ -7,9 +7,9 @@
 #include "../Entities/Player.h"
 #include "../UI/SlotArea.h"
 #include "PluginLua.h"
-#include "Root.h"
 #include "lua/src/lauxlib.h"  // Needed for LUA_REFNIL
-#include "ClientHandle.h"
+#include "../Root.h"
+#include "../ClientHandle.h"
 
 
 
diff --git a/src/Bindings/ManualBindings_RankManager.cpp b/src/Bindings/ManualBindings_RankManager.cpp
index d24685d2b..57296e7ca 100644
--- a/src/Bindings/ManualBindings_RankManager.cpp
+++ b/src/Bindings/ManualBindings_RankManager.cpp
@@ -5,10 +5,10 @@
 
 #include "Globals.h"
 #include "ManualBindings.h"
-#include "../Root.h"
 #include "tolua++/include/tolua++.h"
 #include "LuaState.h"
-#include "UUID.h"
+#include "../Root.h"
+#include "../UUID.h"
 
 
 
diff --git a/src/Bindings/Plugin.h b/src/Bindings/Plugin.h
index fc0e2b4fc..4214706dd 100644
--- a/src/Bindings/Plugin.h
+++ b/src/Bindings/Plugin.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "Defines.h"
+#include "../Defines.h"
 #include "PluginManager.h"
 
 
diff --git a/src/Bindings/PluginManager.h b/src/Bindings/PluginManager.h
index 7a54be8e1..f68a21065 100644
--- a/src/Bindings/PluginManager.h
+++ b/src/Bindings/PluginManager.h
@@ -2,8 +2,8 @@
 #pragma once
 
 
-#include "Defines.h"
-#include "FunctionRef.h"
+#include "../Defines.h"
+#include "../FunctionRef.h"
 
 
 
-- 
cgit v1.2.3