Now use relative paths in for #include

This commit is contained in:
Benoit Blanchon
2014-11-03 18:35:22 +01:00
parent bb816037d6
commit 43ad37e7ce
11 changed files with 31 additions and 33 deletions

View File

@ -6,7 +6,7 @@
#ifndef ARDUINO #ifndef ARDUINO
#include "ArduinoJson/Arduino/Print.hpp" #include "../../include/ArduinoJson/Arduino/Print.hpp"
#include <cstdio> #include <cstdio>
size_t Print::print(const char s[]) { size_t Print::print(const char s[]) {

View File

@ -1,8 +1,6 @@
file(GLOB_RECURSE INC_FILES ../include/*.hpp) file(GLOB_RECURSE INC_FILES ../include/*.hpp)
file(GLOB_RECURSE SRC_FILES *.cpp) file(GLOB_RECURSE SRC_FILES *.cpp)
include_directories(../include)
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
add_definitions( add_definitions(
-Wall -Wall

View File

@ -4,7 +4,7 @@
// Arduino JSON library // Arduino JSON library
// https://github.com/bblanchon/ArduinoJson // https://github.com/bblanchon/ArduinoJson
#include "ArduinoJson/Internals/IndentedPrint.hpp" #include "../../include/ArduinoJson/Internals/IndentedPrint.hpp"
using namespace ArduinoJson::Internals; using namespace ArduinoJson::Internals;

View File

@ -4,16 +4,16 @@
// Arduino JSON library // Arduino JSON library
// https://github.com/bblanchon/ArduinoJson // https://github.com/bblanchon/ArduinoJson
#include "ArduinoJson/Internals/JsonParser.hpp" #include "../../include/ArduinoJson/Internals/JsonParser.hpp"
#include <stdlib.h> // for strtol, strtod #include <stdlib.h> // for strtol, strtod
#include <ctype.h> #include <ctype.h>
#include "ArduinoJson/JsonArray.hpp" #include "../../include/ArduinoJson/JsonArray.hpp"
#include "ArduinoJson/JsonBuffer.hpp" #include "../../include/ArduinoJson/JsonBuffer.hpp"
#include "ArduinoJson/JsonValue.hpp" #include "../../include/ArduinoJson/JsonValue.hpp"
#include "ArduinoJson/JsonObject.hpp" #include "../../include/ArduinoJson/JsonObject.hpp"
#include "ArduinoJson/Internals/QuotedString.hpp" #include "../../include/ArduinoJson/Internals/QuotedString.hpp"
using namespace ArduinoJson; using namespace ArduinoJson;
using namespace ArduinoJson::Internals; using namespace ArduinoJson::Internals;

View File

@ -4,8 +4,8 @@
// Arduino JSON library // Arduino JSON library
// https://github.com/bblanchon/ArduinoJson // https://github.com/bblanchon/ArduinoJson
#include "ArduinoJson/Internals/JsonWriter.hpp" #include "../../include/ArduinoJson/Internals/JsonWriter.hpp"
#include "ArduinoJson/Internals/QuotedString.hpp" #include "../../include/ArduinoJson/Internals/QuotedString.hpp"
using namespace ArduinoJson::Internals; using namespace ArduinoJson::Internals;

View File

@ -4,7 +4,7 @@
// Arduino JSON library // Arduino JSON library
// https://github.com/bblanchon/ArduinoJson // https://github.com/bblanchon/ArduinoJson
#include "ArduinoJson/Internals/QuotedString.hpp" #include "../../include/ArduinoJson/Internals/QuotedString.hpp"
using namespace ArduinoJson::Internals; using namespace ArduinoJson::Internals;

View File

@ -4,7 +4,7 @@
// Arduino JSON library // Arduino JSON library
// https://github.com/bblanchon/ArduinoJson // https://github.com/bblanchon/ArduinoJson
#include "ArduinoJson/Internals/StringBuilder.hpp" #include "../../include/ArduinoJson/Internals/StringBuilder.hpp"
using namespace ArduinoJson::Internals; using namespace ArduinoJson::Internals;

View File

@ -4,13 +4,13 @@
// Arduino JSON library // Arduino JSON library
// https://github.com/bblanchon/ArduinoJson // https://github.com/bblanchon/ArduinoJson
#include "ArduinoJson/JsonArray.hpp" #include "../include/ArduinoJson/JsonArray.hpp"
#include <new> // required for placement new #include <new> // required for placement new
#include "ArduinoJson/JsonBuffer.hpp" #include "../include/ArduinoJson/JsonBuffer.hpp"
#include "ArduinoJson/JsonObject.hpp" #include "../include/ArduinoJson/JsonObject.hpp"
#include "ArduinoJson/Internals/PrettyJsonWriter.hpp" #include "../include/ArduinoJson/Internals/PrettyJsonWriter.hpp"
using namespace ArduinoJson; using namespace ArduinoJson;
using namespace ArduinoJson::Internals; using namespace ArduinoJson::Internals;

View File

@ -4,14 +4,14 @@
// Arduino JSON library // Arduino JSON library
// https://github.com/bblanchon/ArduinoJson // https://github.com/bblanchon/ArduinoJson
#include "ArduinoJson/JsonBuffer.hpp" #include "../include/ArduinoJson/JsonBuffer.hpp"
#include <new> // required for the placement new #include <new> // required for the placement new
#include "ArduinoJson/JsonArray.hpp" #include "../include/ArduinoJson/JsonArray.hpp"
#include "ArduinoJson/JsonObject.hpp" #include "../include/ArduinoJson/JsonObject.hpp"
#include "ArduinoJson/JsonValue.hpp" #include "../include/ArduinoJson/JsonValue.hpp"
#include "ArduinoJson/Internals/JsonParser.hpp" #include "../include/ArduinoJson/Internals/JsonParser.hpp"
using namespace ArduinoJson; using namespace ArduinoJson;
using namespace ArduinoJson::Internals; using namespace ArduinoJson::Internals;

View File

@ -4,16 +4,16 @@
// Arduino JSON library // Arduino JSON library
// https://github.com/bblanchon/ArduinoJson // https://github.com/bblanchon/ArduinoJson
#include "ArduinoJson/JsonObject.hpp" #include "../include/ArduinoJson/JsonObject.hpp"
#include <new> // required for placement new #include <new> // required for placement new
#include <string.h> // for strcmp #include <string.h> // for strcmp
#include "ArduinoJson/JsonBuffer.hpp" #include "../include/ArduinoJson/JsonBuffer.hpp"
#include "ArduinoJson/JsonArray.hpp" #include "../include/ArduinoJson/JsonArray.hpp"
#include "ArduinoJson/JsonValue.hpp" #include "../include/ArduinoJson/JsonValue.hpp"
#include "ArduinoJson/Internals/PrettyJsonWriter.hpp" #include "../include/ArduinoJson/Internals/PrettyJsonWriter.hpp"
#include "ArduinoJson/Internals/StringBuilder.hpp" #include "../include/ArduinoJson/Internals/StringBuilder.hpp"
using namespace ArduinoJson; using namespace ArduinoJson;
using namespace ArduinoJson::Internals; using namespace ArduinoJson::Internals;

View File

@ -4,10 +4,10 @@
// Arduino JSON library // Arduino JSON library
// https://github.com/bblanchon/ArduinoJson // https://github.com/bblanchon/ArduinoJson
#include "ArduinoJson/JsonValue.hpp" #include "../include/ArduinoJson/JsonValue.hpp"
#include "ArduinoJson/JsonArray.hpp" #include "../include/ArduinoJson/JsonArray.hpp"
#include "ArduinoJson/JsonObject.hpp" #include "../include/ArduinoJson/JsonObject.hpp"
#include "ArduinoJson/Internals/PrettyJsonWriter.hpp" #include "../include/ArduinoJson/Internals/PrettyJsonWriter.hpp"
using namespace ArduinoJson; using namespace ArduinoJson;
using namespace ArduinoJson::Internals; using namespace ArduinoJson::Internals;