Przeglądaj źródła

Now use relative paths in for #include

Benoit Blanchon 11 lat temu
rodzic
commit
43ad37e7ce

+ 1 - 1
src/Arduino/Print.cpp

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

+ 0 - 2
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

+ 1 - 1
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;
 

+ 6 - 6
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 <stdlib.h>  // for strtol, strtod
 #include <ctype.h>
 
-#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;

+ 2 - 2
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 4 - 4
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 <new>  // 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;

+ 5 - 5
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 <new>  // 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;

+ 6 - 6
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 <new>       // required for placement new
 #include <string.h>  // 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;

+ 4 - 4
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;