From ee8419701472be9f24c51a41ee7b7ef3cf38f329 Mon Sep 17 00:00:00 2001 From: peterbell10 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/Items/CMakeLists.txt | 3 --- src/Items/ItemItemFrame.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'src/Items') diff --git a/src/Items/CMakeLists.txt b/src/Items/CMakeLists.txt index af09b32ae..92d12b3b3 100644 --- a/src/Items/CMakeLists.txt +++ b/src/Items/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") SET (SRCS ItemHandler.cpp diff --git a/src/Items/ItemItemFrame.h b/src/Items/ItemItemFrame.h index dd3e1f5a8..3136d93e9 100644 --- a/src/Items/ItemItemFrame.h +++ b/src/Items/ItemItemFrame.h @@ -2,7 +2,7 @@ #pragma once #include "ItemHandler.h" -#include "Entities/ItemFrame.h" +#include "../Entities/ItemFrame.h" #include "../Entities/Player.h" -- cgit v1.2.3