From f1e2cb047e48e66d82b0209350923dd9b6984710 Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Thu, 9 May 2019 12:38:25 +0200 Subject: [PATCH 1/3] Avoid cmake warning, restbed doesn't use C compiler --- libretroshare/src/libretroshare.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index 06e2f8265..2edf80f0e 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -853,7 +853,7 @@ rs_jsonapi { git submodule update --init --recommend-shallow dependency/kashmir ; \ true ) && \ mkdir -p $${RESTBED_BUILD_PATH} && cd $${RESTBED_BUILD_PATH} && \ - cmake -DCMAKE_C_COMPILER=$$fixQmakeCC($$QMAKE_CC) \ + cmake \ -DCMAKE_CXX_COMPILER=$$QMAKE_CXX \ $${CMAKE_GENERATOR_OVERRIDE} -DBUILD_SSL=OFF \ -DCMAKE_INSTALL_PREFIX=. -B. \ From 64c4982f41bd3b0c4b76718a6b1650a9c62b7c26 Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Thu, 9 May 2019 12:41:37 +0200 Subject: [PATCH 2/3] Remove problematic git submodule option --recommend-shallow seems to nos be effective, and even causing problems with older git versions --- libretroshare/src/libretroshare.pro | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index 2edf80f0e..c7aff0cfb 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -846,11 +846,11 @@ rs_jsonapi { genrestbedlib.variable_out = PRE_TARGETDEPS genrestbedlib.commands = \ cd $${RS_SRC_PATH} && ( \ - git submodule update --init --recommend-shallow supportlibs/restbed ; \ + git submodule update --init supportlibs/restbed ; \ cd $${RESTBED_SRC_PATH} ; \ - git submodule update --init --recommend-shallow dependency/asio ; \ - git submodule update --init --recommend-shallow dependency/catch ; \ - git submodule update --init --recommend-shallow dependency/kashmir ; \ + git submodule update --init dependency/asio ; \ + git submodule update --init dependency/catch ; \ + git submodule update --init dependency/kashmir ; \ true ) && \ mkdir -p $${RESTBED_BUILD_PATH} && cd $${RESTBED_BUILD_PATH} && \ cmake \ @@ -919,7 +919,7 @@ rs_broadcast_discovery { udpdiscoverycpplib.variable_out = PRE_TARGETDEPS udpdiscoverycpplib.commands = \ cd $${RS_SRC_PATH} && ( \ - git submodule update --init --recommend-shallow supportlibs/udp-discovery-cpp || \ + git submodule update --init supportlibs/udp-discovery-cpp || \ true ) && \ mkdir -p $${UDP_DISCOVERY_BUILD_PATH} && \ cd $${UDP_DISCOVERY_BUILD_PATH} && \ From 2704313004eab86fb10a61c887b4307e3b0a7b98 Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Fri, 10 May 2019 17:58:38 +0200 Subject: [PATCH 3/3] Disable cmark by default in the correct place --- retroshare.pri | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/retroshare.pri b/retroshare.pri index 2d8130084..39fec7458 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -28,11 +28,9 @@ CONFIG *= retroshare_gui no_retroshare_gui:CONFIG -= retroshare_gui +# Enable GXS distant syncronization CONFIG *= gxsdistsync -# disabled by the time we fix compilation -CONFIG *= no_cmark - # To disable RetroShare-nogui append the following # assignation to qmake command line "CONFIG+=no_retroshare_nogui" CONFIG *= retroshare_nogui @@ -40,8 +38,8 @@ no_retroshare_nogui:CONFIG -= retroshare_nogui # To disable cmark append the following # assignation to qmake command line "CONFIG+=no_cmark" -CONFIG *= cmark -no_cmark:CONFIG -= cmark +CONFIG *= no_cmark +cmark:CONFIG -= no_cmark # To enable RetroShare plugins append the following # assignation to qmake command line "CONFIG+=retroshare_plugins"