Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-24 14:23:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1562 from G10h4ck/build_refinement

Browse Source 
Little improvements in build system
This commit is contained in:
G10h4ck 2019-05-14 23:03:00 +02:00 committed by GitHub
commit 533ceed549
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libretroshare/src/libretroshare.pro
View File

@ -846,14 +846,14 @@ rs_jsonapi {
genrestbedlib.variable_out = PRE_TARGETDEPS genrestbedlib.variable_out = PRE_TARGETDEPS
genrestbedlib.commands = \ genrestbedlib.commands = \
cd $${RS_SRC_PATH} && ( \ cd $${RS_SRC_PATH} && ( \
git submodule update --init --recommend-shallow supportlibs/restbed ; \ git submodule update --init supportlibs/restbed ; \
cd $${RESTBED_SRC_PATH} ; \ cd $${RESTBED_SRC_PATH} ; \
git submodule update --init --recommend-shallow dependency/asio ; \ git submodule update --init dependency/asio ; \
git submodule update --init --recommend-shallow dependency/catch ; \ git submodule update --init dependency/catch ; \
git submodule update --init --recommend-shallow dependency/kashmir ; \ git submodule update --init dependency/kashmir ; \
true ) && \ true ) && \
mkdir -p $${RESTBED_BUILD_PATH} && cd $${RESTBED_BUILD_PATH} && \ mkdir -p $${RESTBED_BUILD_PATH} && cd $${RESTBED_BUILD_PATH} && \
cmake -DCMAKE_C_COMPILER=$$fixQmakeCC($$QMAKE_CC) \ cmake \
-DCMAKE_CXX_COMPILER=$$QMAKE_CXX \ -DCMAKE_CXX_COMPILER=$$QMAKE_CXX \
$${CMAKE_GENERATOR_OVERRIDE} -DBUILD_SSL=OFF \ $${CMAKE_GENERATOR_OVERRIDE} -DBUILD_SSL=OFF \
-DCMAKE_INSTALL_PREFIX=. -B. \ -DCMAKE_INSTALL_PREFIX=. -B. \
@ -919,7 +919,7 @@ rs_broadcast_discovery {
udpdiscoverycpplib.variable_out = PRE_TARGETDEPS udpdiscoverycpplib.variable_out = PRE_TARGETDEPS
udpdiscoverycpplib.commands = \ udpdiscoverycpplib.commands = \
cd $${RS_SRC_PATH} && ( \ cd $${RS_SRC_PATH} && ( \
git submodule update --init --recommend-shallow supportlibs/udp-discovery-cpp || \ git submodule update --init supportlibs/udp-discovery-cpp || \
true ) && \ true ) && \
mkdir -p $${UDP_DISCOVERY_BUILD_PATH} && \ mkdir -p $${UDP_DISCOVERY_BUILD_PATH} && \
cd $${UDP_DISCOVERY_BUILD_PATH} && \ cd $${UDP_DISCOVERY_BUILD_PATH} && \

8
retroshare.pri
View File

@ -28,11 +28,9 @@
CONFIG *= retroshare_gui CONFIG *= retroshare_gui
no_retroshare_gui:CONFIG -= retroshare_gui no_retroshare_gui:CONFIG -= retroshare_gui
# Enable GXS distant syncronization
CONFIG *= gxsdistsync CONFIG *= gxsdistsync
# disabled by the time we fix compilation
CONFIG *= no_cmark
# To disable RetroShare-nogui append the following # To disable RetroShare-nogui append the following
# assignation to qmake command line "CONFIG+=no_retroshare_nogui" # assignation to qmake command line "CONFIG+=no_retroshare_nogui"
CONFIG *= retroshare_nogui CONFIG *= retroshare_nogui
@ -40,8 +38,8 @@ no_retroshare_nogui:CONFIG -= retroshare_nogui
# To disable cmark append the following # To disable cmark append the following
# assignation to qmake command line "CONFIG+=no_cmark" # assignation to qmake command line "CONFIG+=no_cmark"
CONFIG *= cmark CONFIG *= no_cmark
no_cmark:CONFIG -= cmark cmark:CONFIG -= no_cmark
# To enable RetroShare plugins append the following # To enable RetroShare plugins append the following
# assignation to qmake command line "CONFIG+=retroshare_plugins" # assignation to qmake command line "CONFIG+=retroshare_plugins"