Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-25 07:25:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into deep_search

Browse source 
Needed to make deep search and GXS search cooperate
This commit is contained in:
Gioacchino Mazzurco 2018-07-20 13:15:11 +02:00
commit a31b06ab60
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
103 changed files with 5004 additions and 989 deletions
Download patch file Download diff file Expand all files Collapse all files

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
# anymore in the meantime, they are part of the RS directory so that it is
# 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 =
mLibs = $$RS_SQL_LIB ssl crypto $$RS_THREAD_LIB $$RS_UPNP_LIB