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/mbedTLS++/BlockingSslClientSocket.h | 2 +- src/mbedTLS++/CMakeLists.txt | 3 --- src/mbedTLS++/SslConfig.cpp | 2 +- src/mbedTLS++/SslContext.cpp | 4 ++-- 4 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/mbedTLS++') diff --git a/src/mbedTLS++/BlockingSslClientSocket.h b/src/mbedTLS++/BlockingSslClientSocket.h index 32c606535..8cd642707 100644 --- a/src/mbedTLS++/BlockingSslClientSocket.h +++ b/src/mbedTLS++/BlockingSslClientSocket.h @@ -9,7 +9,7 @@ #pragma once -#include "OSSupport/Network.h" +#include "../OSSupport/Network.h" #include "CallbackSslContext.h" diff --git a/src/mbedTLS++/CMakeLists.txt b/src/mbedTLS++/CMakeLists.txt index 2b7e43dce..29c323cc6 100644 --- a/src/mbedTLS++/CMakeLists.txt +++ b/src/mbedTLS++/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") set(SRCS AesCfb128Decryptor.cpp diff --git a/src/mbedTLS++/SslConfig.cpp b/src/mbedTLS++/SslConfig.cpp index c97e29cda..4b7882dcf 100644 --- a/src/mbedTLS++/SslConfig.cpp +++ b/src/mbedTLS++/SslConfig.cpp @@ -1,7 +1,7 @@ #include "Globals.h" -#include "mbedTLS++/SslConfig.h" +#include "SslConfig.h" #include "EntropyContext.h" #include "CtrDrbgContext.h" #include "CryptoKey.h" diff --git a/src/mbedTLS++/SslContext.cpp b/src/mbedTLS++/SslContext.cpp index d5b8525a6..581b8fb50 100644 --- a/src/mbedTLS++/SslContext.cpp +++ b/src/mbedTLS++/SslContext.cpp @@ -4,8 +4,8 @@ // Implements the cSslContext class that holds everything a single SSL context needs to function #include "Globals.h" -#include "mbedTLS++/SslContext.h" -#include "mbedTLS++/SslConfig.h" +#include "../mbedTLS++/SslContext.h" +#include "../mbedTLS++/SslConfig.h" -- cgit v1.2.3