From 6bae8237e169fb99b1fbff36d49d61014f509f47 Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@eigenlab.org>
Date: Thu, 28 Nov 2019 15:48:17 +0100
Subject: [PATCH] TavisCI OSX add miniupnpc include and lib path

---
 .travis.yml                             | 28 ++++++++++++++++++++-----
 README.asciidoc                         |  4 ++++
 RetroShare.pro                          |  2 ++
 libretroshare/src/use_libretroshare.pri |  1 -
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 56becce24..14de55fd2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,13 +16,21 @@ matrix:
 
 before_install:
   - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update; fi
-  - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get install -y build-essential libssl-dev libsqlcipher-dev libbz2-dev libsqlite3-dev libupnp-dev pkg-config qt5-default libxss-dev qtmultimedia5-dev libqt5x11extras5-dev libqt5designer5 libxapian-dev qttools5-dev rapidjson-dev ; fi
-
+  - >
+    if [ $TRAVIS_OS_NAME == linux ]; then
+    sudo apt-get install -y
+    build-essential libssl-dev libsqlcipher-dev libbz2-dev libsqlite3-dev
+    libupnp-dev pkg-config qt5-default libxss-dev qtmultimedia5-dev
+    libqt5x11extras5-dev libqt5designer5 libxapian-dev qttools5-dev
+    rapidjson-dev ;
+    fi
   - if [ $TRAVIS_OS_NAME == osx ]; then brew update ; fi
-  - if [ $TRAVIS_OS_NAME == osx ]; then brew install ccache; export PATH="/usr/local/opt/ccache/libexec:$PATH" ; fi
   - if [ $TRAVIS_OS_NAME == osx ]; then brew install qt5; fi
   - if [ $TRAVIS_OS_NAME == osx ]; then brew link --force qt5 ; fi
-  - if [ $TRAVIS_OS_NAME == osx ]; then brew install openssl miniupnpc rapidjson sqlcipher xapian cmark; fi
+  - >
+    if [ $TRAVIS_OS_NAME == osx ]; then
+    brew install openssl miniupnpc rapidjson sqlcipher xapian cmark;
+    fi
   - if [ $TRAVIS_OS_NAME == osx ]; then brew install p7zip; fi
   - if [ $TRAVIS_OS_NAME == osx ]; then npm install -g appdmg; fi
 
@@ -44,7 +52,17 @@ addons:
 before_script:
   - env
   - if [ $TRAVIS_OS_NAME == linux ]; then qmake; fi
-  - if [ $TRAVIS_OS_NAME == osx ]; then qmake CONFIG+=rs_macos10.14 INCLUDEPATH+=$(find /usr/local/Cellar/openssl*/*/include/ | head -n 1) INCLUDEPATH+=$(find /usr/local/Cellar/rapidjson/*/include | head -n 1) INCLUDEPATH+=$(find /usr/local/Cellar/sqlcipher/*/include | head -n 1) QMAKE_LIBDIR+=$(find /usr/local/Cellar/openssl*/*/lib/ | head -n 1) QMAKE_LIBDIR+=$(find /usr/local/Cellar/sqlcipher/*/lib | head -n 1); fi
+  - >
+    if [ $TRAVIS_OS_NAME == osx ]; then
+    qmake CONFIG+=rs_macos10.14
+    INCLUDEPATH+=$(find /usr/local/Cellar/miniupnpc/*/include | head -n 1)
+    QMAKE_LIBDIR+=$(find /usr/local/Cellar/miniupnpc/*/lib/   | head -n 1)
+    INCLUDEPATH+=$(find /usr/local/Cellar/openssl*/*/include/ | head -n 1)
+    QMAKE_LIBDIR+=$(find /usr/local/Cellar/openssl*/*/lib/    | head -n 1)
+    INCLUDEPATH+=$(find /usr/local/Cellar/rapidjson/*/include | head -n 1)
+    INCLUDEPATH+=$(find /usr/local/Cellar/sqlcipher/*/include | head -n 1)
+    QMAKE_LIBDIR+=$(find /usr/local/Cellar/sqlcipher/*/lib    | head -n 1);
+    fi
 
 script:
   - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j4; fi
diff --git a/README.asciidoc b/README.asciidoc
index 2086c1bd5..14da7ebd9 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -19,6 +19,10 @@ updated documentation on how to build retroshare, instead we provide scripts and
 receipts that are used to create the packages for the supported platforms and
 more in the `build_scripts` directory of this repository.
 
+Those packaging receipts toghether with the continuous integration files
+`.travis.yml` and `appveyor.yml` are a good source of knoweldge on how to
+compile retroshare on different platforms.
+
 
 == Using RetroShare on a headless computer with WebUI
 
diff --git a/RetroShare.pro b/RetroShare.pro
index 845cdd3a6..760da5cb2 100644
--- a/RetroShare.pro
+++ b/RetroShare.pro
@@ -16,6 +16,8 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.       #
 ################################################################################
 
+CONFIG += c++11
+
 !include("retroshare.pri"): error("Could not include file retroshare.pri")
 
 TEMPLATE = subdirs
diff --git a/libretroshare/src/use_libretroshare.pri b/libretroshare/src/use_libretroshare.pri
index 8809d8493..11a9801d8 100644
--- a/libretroshare/src/use_libretroshare.pri
+++ b/libretroshare/src/use_libretroshare.pri
@@ -18,7 +18,6 @@
 RS_SRC_PATH=$$clean_path($${PWD}/../../)
 RS_BUILD_PATH=$$clean_path($${OUT_PWD}/../../)
 
-CONFIG += c++11
 DEPENDPATH *= $$clean_path($${RS_SRC_PATH}/libretroshare/src/)
 INCLUDEPATH  *= $$clean_path($${RS_SRC_PATH}/libretroshare/src)
 LIBS *= -L$$clean_path($${RS_BUILD_PATH}/libretroshare/src/lib/) -lretroshare