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/Protocol/Protocol_1_9.h | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'src/Protocol/Protocol_1_9.h') diff --git a/src/Protocol/Protocol_1_9.h b/src/Protocol/Protocol_1_9.h index ee29775f1..d43c2bf09 100644 --- a/src/Protocol/Protocol_1_9.h +++ b/src/Protocol/Protocol_1_9.h @@ -22,21 +22,8 @@ Declares the 1.9 protocol classes: #include "Protocol.h" #include "../ByteBuffer.h" -#ifdef _MSC_VER - #pragma warning(push) - #pragma warning(disable:4127) - #pragma warning(disable:4244) - #pragma warning(disable:4231) - #pragma warning(disable:4189) - #pragma warning(disable:4702) -#endif - -#ifdef _MSC_VER - #pragma warning(pop) -#endif - -#include "mbedTLS++/AesCfb128Decryptor.h" -#include "mbedTLS++/AesCfb128Encryptor.h" +#include "../mbedTLS++/AesCfb128Decryptor.h" +#include "../mbedTLS++/AesCfb128Encryptor.h" -- cgit v1.2.3