From 43ad37e7ce9d6d56941b8a1c1621141be6b248ab Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Mon, 3 Nov 2014 18:35:22 +0100 Subject: [PATCH] Now use relative paths in for #include --- src/Arduino/Print.cpp | 2 +- src/CMakeLists.txt | 2 -- src/Internals/IndentedPrint.cpp | 2 +- src/Internals/JsonParser.cpp | 12 ++++++------ src/Internals/JsonWriter.cpp | 4 ++-- src/Internals/QuotedString.cpp | 2 +- src/Internals/StringBuilder.cpp | 2 +- src/JsonArray.cpp | 8 ++++---- src/JsonBuffer.cpp | 10 +++++----- src/JsonObject.cpp | 12 ++++++------ src/JsonValue.cpp | 8 ++++---- 11 files changed, 31 insertions(+), 33 deletions(-) diff --git a/src/Arduino/Print.cpp b/src/Arduino/Print.cpp index 6525f04a..343cc8ab 100644 --- a/src/Arduino/Print.cpp +++ b/src/Arduino/Print.cpp @@ -6,7 +6,7 @@ #ifndef ARDUINO -#include "ArduinoJson/Arduino/Print.hpp" +#include "../../include/ArduinoJson/Arduino/Print.hpp" #include size_t Print::print(const char s[]) { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 887c1f0b..c2db2e6b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,6 @@ file(GLOB_RECURSE INC_FILES ../include/*.hpp) file(GLOB_RECURSE SRC_FILES *.cpp) -include_directories(../include) - if(CMAKE_COMPILER_IS_GNUCXX) add_definitions( -Wall diff --git a/src/Internals/IndentedPrint.cpp b/src/Internals/IndentedPrint.cpp index ef62c4e6..3ecdea54 100644 --- a/src/Internals/IndentedPrint.cpp +++ b/src/Internals/IndentedPrint.cpp @@ -4,7 +4,7 @@ // Arduino JSON library // https://github.com/bblanchon/ArduinoJson -#include "ArduinoJson/Internals/IndentedPrint.hpp" +#include "../../include/ArduinoJson/Internals/IndentedPrint.hpp" using namespace ArduinoJson::Internals; diff --git a/src/Internals/JsonParser.cpp b/src/Internals/JsonParser.cpp index 9d6ef761..a3a427b7 100644 --- a/src/Internals/JsonParser.cpp +++ b/src/Internals/JsonParser.cpp @@ -4,16 +4,16 @@ // Arduino JSON library // https://github.com/bblanchon/ArduinoJson -#include "ArduinoJson/Internals/JsonParser.hpp" +#include "../../include/ArduinoJson/Internals/JsonParser.hpp" #include // for strtol, strtod #include -#include "ArduinoJson/JsonArray.hpp" -#include "ArduinoJson/JsonBuffer.hpp" -#include "ArduinoJson/JsonValue.hpp" -#include "ArduinoJson/JsonObject.hpp" -#include "ArduinoJson/Internals/QuotedString.hpp" +#include "../../include/ArduinoJson/JsonArray.hpp" +#include "../../include/ArduinoJson/JsonBuffer.hpp" +#include "../../include/ArduinoJson/JsonValue.hpp" +#include "../../include/ArduinoJson/JsonObject.hpp" +#include "../../include/ArduinoJson/Internals/QuotedString.hpp" using namespace ArduinoJson; using namespace ArduinoJson::Internals; diff --git a/src/Internals/JsonWriter.cpp b/src/Internals/JsonWriter.cpp index 9054cd95..1a32f030 100644 --- a/src/Internals/JsonWriter.cpp +++ b/src/Internals/JsonWriter.cpp @@ -4,8 +4,8 @@ // Arduino JSON library // https://github.com/bblanchon/ArduinoJson -#include "ArduinoJson/Internals/JsonWriter.hpp" -#include "ArduinoJson/Internals/QuotedString.hpp" +#include "../../include/ArduinoJson/Internals/JsonWriter.hpp" +#include "../../include/ArduinoJson/Internals/QuotedString.hpp" using namespace ArduinoJson::Internals; diff --git a/src/Internals/QuotedString.cpp b/src/Internals/QuotedString.cpp index 193af003..9f2f1aff 100644 --- a/src/Internals/QuotedString.cpp +++ b/src/Internals/QuotedString.cpp @@ -4,7 +4,7 @@ // Arduino JSON library // https://github.com/bblanchon/ArduinoJson -#include "ArduinoJson/Internals/QuotedString.hpp" +#include "../../include/ArduinoJson/Internals/QuotedString.hpp" using namespace ArduinoJson::Internals; diff --git a/src/Internals/StringBuilder.cpp b/src/Internals/StringBuilder.cpp index f38c38fe..c3ffb4cb 100644 --- a/src/Internals/StringBuilder.cpp +++ b/src/Internals/StringBuilder.cpp @@ -4,7 +4,7 @@ // Arduino JSON library // https://github.com/bblanchon/ArduinoJson -#include "ArduinoJson/Internals/StringBuilder.hpp" +#include "../../include/ArduinoJson/Internals/StringBuilder.hpp" using namespace ArduinoJson::Internals; diff --git a/src/JsonArray.cpp b/src/JsonArray.cpp index f959515d..469105c9 100644 --- a/src/JsonArray.cpp +++ b/src/JsonArray.cpp @@ -4,13 +4,13 @@ // Arduino JSON library // https://github.com/bblanchon/ArduinoJson -#include "ArduinoJson/JsonArray.hpp" +#include "../include/ArduinoJson/JsonArray.hpp" #include // required for placement new -#include "ArduinoJson/JsonBuffer.hpp" -#include "ArduinoJson/JsonObject.hpp" -#include "ArduinoJson/Internals/PrettyJsonWriter.hpp" +#include "../include/ArduinoJson/JsonBuffer.hpp" +#include "../include/ArduinoJson/JsonObject.hpp" +#include "../include/ArduinoJson/Internals/PrettyJsonWriter.hpp" using namespace ArduinoJson; using namespace ArduinoJson::Internals; diff --git a/src/JsonBuffer.cpp b/src/JsonBuffer.cpp index c09a8f96..35aa7b95 100644 --- a/src/JsonBuffer.cpp +++ b/src/JsonBuffer.cpp @@ -4,14 +4,14 @@ // Arduino JSON library // https://github.com/bblanchon/ArduinoJson -#include "ArduinoJson/JsonBuffer.hpp" +#include "../include/ArduinoJson/JsonBuffer.hpp" #include // required for the placement new -#include "ArduinoJson/JsonArray.hpp" -#include "ArduinoJson/JsonObject.hpp" -#include "ArduinoJson/JsonValue.hpp" -#include "ArduinoJson/Internals/JsonParser.hpp" +#include "../include/ArduinoJson/JsonArray.hpp" +#include "../include/ArduinoJson/JsonObject.hpp" +#include "../include/ArduinoJson/JsonValue.hpp" +#include "../include/ArduinoJson/Internals/JsonParser.hpp" using namespace ArduinoJson; using namespace ArduinoJson::Internals; diff --git a/src/JsonObject.cpp b/src/JsonObject.cpp index 7ee8ffb1..4d02a3ed 100644 --- a/src/JsonObject.cpp +++ b/src/JsonObject.cpp @@ -4,16 +4,16 @@ // Arduino JSON library // https://github.com/bblanchon/ArduinoJson -#include "ArduinoJson/JsonObject.hpp" +#include "../include/ArduinoJson/JsonObject.hpp" #include // required for placement new #include // for strcmp -#include "ArduinoJson/JsonBuffer.hpp" -#include "ArduinoJson/JsonArray.hpp" -#include "ArduinoJson/JsonValue.hpp" -#include "ArduinoJson/Internals/PrettyJsonWriter.hpp" -#include "ArduinoJson/Internals/StringBuilder.hpp" +#include "../include/ArduinoJson/JsonBuffer.hpp" +#include "../include/ArduinoJson/JsonArray.hpp" +#include "../include/ArduinoJson/JsonValue.hpp" +#include "../include/ArduinoJson/Internals/PrettyJsonWriter.hpp" +#include "../include/ArduinoJson/Internals/StringBuilder.hpp" using namespace ArduinoJson; using namespace ArduinoJson::Internals; diff --git a/src/JsonValue.cpp b/src/JsonValue.cpp index ddb81acf..9baa8b17 100644 --- a/src/JsonValue.cpp +++ b/src/JsonValue.cpp @@ -4,10 +4,10 @@ // Arduino JSON library // https://github.com/bblanchon/ArduinoJson -#include "ArduinoJson/JsonValue.hpp" -#include "ArduinoJson/JsonArray.hpp" -#include "ArduinoJson/JsonObject.hpp" -#include "ArduinoJson/Internals/PrettyJsonWriter.hpp" +#include "../include/ArduinoJson/JsonValue.hpp" +#include "../include/ArduinoJson/JsonArray.hpp" +#include "../include/ArduinoJson/JsonObject.hpp" +#include "../include/ArduinoJson/Internals/PrettyJsonWriter.hpp" using namespace ArduinoJson; using namespace ArduinoJson::Internals;