diff --git a/.travis.yml b/.travis.yml index abc796ecd..90a8f8514 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,8 @@ addons: branch_pattern: coverity_scan before_script: - - qmake QMAKE_CC=$CC QMAKE_CXX=$CXX CONFIG+=no_sqlcipher CONFIG+=tests + - if [ $TRAVIS_OS_NAME == linux ]; then qmake QMAKE_CC=$CC QMAKE_CXX=$CXX CONFIG+=no_sqlcipher CONFIG+=tests ; fi + - if [ $TRAVIS_OS_NAME == osx ]; then qmake QMAKE_CC=$CC QMAKE_CXX=$CXX CONFIG+=no_sqlcipher CONFIG+=tests CONFIG+=rs_macos10.12 ; fi script: - if [ $TRAVIS_OS_NAME == linux ] && [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make && tests/unittests/unittests >/dev/null 2>&1 ; fi diff --git a/plugins/FeedReader/FeedReader.pro b/plugins/FeedReader/FeedReader.pro index 022412a3f..7e7e40fdd 100644 --- a/plugins/FeedReader/FeedReader.pro +++ b/plugins/FeedReader/FeedReader.pro @@ -116,10 +116,10 @@ macx { } } } - DEPENDPATH += . $$INC_DIRs + DEPENDPATH += . $$INC_DIR INCLUDEPATH += . $$INC_DIR - LIBS = -lcurl -lxml2 -lxslt -lcrypto + LIBS += -lcurl -lxml2 -lxslt -lcrypto } openbsd-* { diff --git a/retroshare.pri b/retroshare.pri index c4441563f..0ab23042a 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -87,7 +87,7 @@ CONFIG *= no_rs_async_chat rs_async_chat:CONFIG -= no_rs_async_chat # To select your MacOsX version append the following assignation to qmake -# command line "CONFIG+=rs_macos10.11" where 10.11(default for Travis_CI) depends your version +# command line "CONFIG+=rs_macos10.11" where 10.11 depends your version CONFIG *= rs_macos10.11 rs_macos10.8:CONFIG -= rs_macos10.11 rs_macos10.9:CONFIG -= rs_macos10.11 @@ -196,6 +196,8 @@ rs_macos10.12 { message(***retroshare.pri: Set Target and SDK to MacOS 10.12 ) QMAKE_MACOSX_DEPLOYMENT_TARGET=10.12 QMAKE_MAC_SDK = macosx10.12 + QMAKE_CXXFLAGS += -Wno-nullability-completeness + QMAKE_CFLAGS += -Wno-nullability-completeness } macx {