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

make sure rs_webui cannot be enabled without rs_jsonapi

Browse Source
This commit is contained in:
csoler 2019-11-27 21:22:21 +01:00
parent 9a24af87a4
commit 887e3ad394
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RetroShare.pro
View File

@ -29,6 +29,12 @@ rs_jsonapi:isEmpty(JSONAPI_GENERATOR_EXE) {
libretroshare.depends += jsonapi-generator libretroshare.depends += jsonapi-generator
} }
rs_webui {
!rs_jsonapi {
error("rs_webui requires rs_jsonapi")
}
}
SUBDIRS += libbitdht SUBDIRS += libbitdht
libbitdht.file = libbitdht/src/libbitdht.pro libbitdht.file = libbitdht/src/libbitdht.pro
libretroshare.depends += openpgpsdk libbitdht libretroshare.depends += openpgpsdk libbitdht

8
retroshare.pri
View File

@ -180,10 +180,10 @@ rs_use_native_dialogs:CONFIG -= no_rs_use_native_dialogs
CONFIG *= rs_broadcast_discovery CONFIG *= rs_broadcast_discovery
no_rs_broadcast_discovery:CONFIG -= rs_broadcast_discovery no_rs_broadcast_discovery:CONFIG -= rs_broadcast_discovery
# To disable webui append the following assignation to qmake # To enable webui append the following assignation to qmake
# command line "CONFIG+=rs_no_webui" # command line "CONFIG+=rs_webui"
CONFIG *= rs_webui CONFIG *= rs_no_webui
rs_no_webui:CONFIG -= rs_webui rs_webui:CONFIG -= rs_no_webui
# To enable webui append the following assignation to qmake # To enable webui append the following assignation to qmake
# command line "CONFIG+=rs_service_webui_terminal_password" # command line "CONFIG+=rs_service_webui_terminal_password"