Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

add auto detection of installed rapidjson

Browse Source
This commit is contained in:
sehraf 2018-07-16 23:22:04 +02:00
parent 01d48256a4
commit 55e99ef0d1
No known key found for this signature in database
GPG Key ID: DF09F6EAE356B2C6
4 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/serialiser/rsserializer.h
View File

@ -154,7 +154,11 @@
#include <string.h> #include <string.h>
#include <iostream> #include <iostream>
#include <string> #include <string>
#ifdef HAS_RAPIDJSON
#include <rapidjson/document.h>
#else
#include <rapid_json/document.h> #include <rapid_json/document.h>
#endif // HAS_RAPIDJSON
#include "retroshare/rsflags.h" #include "retroshare/rsflags.h"
#include "serialiser/rsserial.h" #include "serialiser/rsserial.h"

5
libretroshare/src/serialiser/rstypeserializer.cc
View File

@ -36,8 +36,11 @@
#include <string> #include <string>
#include <typeinfo> // for typeid #include <typeinfo> // for typeid
#include <rapid_json/document.h> #ifdef HAS_RAPIDJSON
#include <rapidjson/prettywriter.h>
#else
#include <rapid_json/prettywriter.h> #include <rapid_json/prettywriter.h>
#endif // HAS_RAPIDJSON
//static const uint32_t MAX_SERIALIZED_ARRAY_SIZE = 500 ; //static const uint32_t MAX_SERIALIZED_ARRAY_SIZE = 500 ;
static const uint32_t MAX_SERIALIZED_CHUNK_SIZE = 10*1024*1024 ; // 10 MB. static const uint32_t MAX_SERIALIZED_CHUNK_SIZE = 10*1024*1024 ; // 10 MB.

4
libretroshare/src/serialiser/rstypeserializer.h
View File

@ -35,7 +35,11 @@
#include "serialiser/rsserializer.h" #include "serialiser/rsserializer.h"
#include "serialiser/rsserializable.h" #include "serialiser/rsserializable.h"
#ifdef HAS_RAPIDJSON
#include <rapidjson/document.h>
#else
#include <rapid_json/document.h> #include <rapid_json/document.h>
#endif // HAS_RAPIDJSON
#include <typeinfo> // for typeid #include <typeinfo> // for typeid
#include <type_traits> #include <type_traits>
#include <errno.h> #include <errno.h>

10
libretroshare/src/use_libretroshare.pri
View File

@ -16,7 +16,15 @@ bitdht {
# when rapidjson is mainstream on all distribs, we will not need the sources # when rapidjson is mainstream on all distribs, we will not need the sources
# anymore in the meantime, they are part of the RS directory so that it is # anymore in the meantime, they are part of the RS directory so that it is
# always possible to find them # always possible to find them
INCLUDEPATH *= $$system_path($$clean_path($${PWD}/../../rapidjson-1.1.0)) RAPIDJSON_AVAILABLE = $$system(pkg-config --atleast-version 1.1 RapidJSON && echo yes)
isEmpty(RAPIDJSON_AVAILABLE) {
message("using built-in rapidjson")
INCLUDEPATH *= $$system_path($$clean_path($${PWD}/../../rapidjson-1.1.0))
} else {
message("using systems rapidjson")
DEFINES *= HAS_RAPIDJSON
}
sLibs = sLibs =
mLibs = $$RS_SQL_LIB ssl crypto $$RS_THREAD_LIB $$RS_UPNP_LIB mLibs = $$RS_SQL_LIB ssl crypto $$RS_THREAD_LIB $$RS_UPNP_LIB