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/HTTP/CMakeLists.txt | 3 --- src/HTTP/HTTPServer.cpp | 2 +- src/HTTP/HTTPServer.h | 4 ++-- src/HTTP/SslHTTPServerConnection.h | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/HTTP') diff --git a/src/HTTP/CMakeLists.txt b/src/HTTP/CMakeLists.txt index 0f12e4e7c..1bd311dc4 100644 --- a/src/HTTP/CMakeLists.txt +++ b/src/HTTP/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") SET (SRCS EnvelopeParser.cpp diff --git a/src/HTTP/HTTPServer.cpp b/src/HTTP/HTTPServer.cpp index 24f10ff16..e499d98dc 100644 --- a/src/HTTP/HTTPServer.cpp +++ b/src/HTTP/HTTPServer.cpp @@ -9,7 +9,7 @@ #include "HTTPServerConnection.h" #include "HTTPFormParser.h" #include "SslHTTPServerConnection.h" -#include "mbedTLS++/SslConfig.h" +#include "../mbedTLS++/SslConfig.h" diff --git a/src/HTTP/HTTPServer.h b/src/HTTP/HTTPServer.h index fe9f091dc..33f316b51 100644 --- a/src/HTTP/HTTPServer.h +++ b/src/HTTP/HTTPServer.h @@ -11,8 +11,8 @@ #include "../OSSupport/Network.h" #include "../IniFile.h" -#include "mbedTLS++/CryptoKey.h" -#include "mbedTLS++/X509Cert.h" +#include "../mbedTLS++/CryptoKey.h" +#include "../mbedTLS++/X509Cert.h" diff --git a/src/HTTP/SslHTTPServerConnection.h b/src/HTTP/SslHTTPServerConnection.h index 6fd3ff309..3ea62c3d9 100644 --- a/src/HTTP/SslHTTPServerConnection.h +++ b/src/HTTP/SslHTTPServerConnection.h @@ -10,7 +10,7 @@ #pragma once #include "HTTPServerConnection.h" -#include "mbedTLS++/BufferedSslContext.h" +#include "../mbedTLS++/BufferedSslContext.h" -- cgit v1.2.3