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/Generating/CMakeLists.txt         | 3 ---
 src/Generating/ChunkGenerator.cpp     | 4 ++--
 src/Generating/PieceStructuresGen.cpp | 2 +-
 src/Generating/PrefabPiecePool.cpp    | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/Generating')

diff --git a/src/Generating/CMakeLists.txt b/src/Generating/CMakeLists.txt
index c7980a096..f01647d0e 100644
--- a/src/Generating/CMakeLists.txt
+++ b/src/Generating/CMakeLists.txt
@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	BioGen.cpp
diff --git a/src/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp
index 103920498..166a05ca2 100644
--- a/src/Generating/ChunkGenerator.cpp
+++ b/src/Generating/ChunkGenerator.cpp
@@ -2,11 +2,11 @@
 #include "Globals.h"
 
 #include "ChunkGenerator.h"
-#include "../IniFile.h"
 #include "ChunkDesc.h"
 #include "ComposableGenerator.h"
 #include "Noise3DGenerator.h"
-#include "FastRandom.h"
+#include "../IniFile.h"
+#include "../FastRandom.h"
 
 
 
diff --git a/src/Generating/PieceStructuresGen.cpp b/src/Generating/PieceStructuresGen.cpp
index c1648e258..4f31c6833 100644
--- a/src/Generating/PieceStructuresGen.cpp
+++ b/src/Generating/PieceStructuresGen.cpp
@@ -7,7 +7,7 @@
 #include "PieceStructuresGen.h"
 #include "PrefabStructure.h"
 #include "PieceGeneratorBFSTree.h"
-#include "IniFile.h"
+#include "../IniFile.h"
 #include "../Stopwatch.h"
 
 
diff --git a/src/Generating/PrefabPiecePool.cpp b/src/Generating/PrefabPiecePool.cpp
index fb8f252c0..16d1f3440 100644
--- a/src/Generating/PrefabPiecePool.cpp
+++ b/src/Generating/PrefabPiecePool.cpp
@@ -5,9 +5,9 @@
 
 #include "Globals.h"
 #include "PrefabPiecePool.h"
-#include "../Bindings/LuaState.h"
-#include "WorldStorage/SchematicFileSerializer.h"
 #include "VerticalStrategy.h"
+#include "../Bindings/LuaState.h"
+#include "../WorldStorage/SchematicFileSerializer.h"
 #include "../StringCompression.h"
 
 
-- 
cgit v1.2.3