From cbcd5f3863b6edf22b6d6ffb625bd338f3ea112d Mon Sep 17 00:00:00 2001 From: Steve Wills Date: Tue, 1 Sep 2020 15:58:23 -0400 Subject: [PATCH] use packaged qtkeychain on FreeBSD (#1929) --- .cirrus.yml | 2 +- lib/qtkeychain.pri | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index b2d6de5b4..3e5242849 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -9,5 +9,5 @@ task: git submodule update mkdir build cd build - qmake INCLUDEPATH+=/usr/local/include/qt5keychain LIBS+=-lqt5keychain RAPIDJSON_SYSTEM=1 QMAKE_CC="cc" QMAKE_CXX="c++" QMAKE_LINK_C="cc" QMAKE_LINK_C_SHLIB="cc" QMAKE_LINK="c++" QMAKE_LINK_SHLIB="c++" QMAKE_CFLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " QMAKE_CXXFLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " QMAKE_LFLAGS="-fstack-protector-strong" QMAKE_LIBS="" QMAKE_CFLAGS_DEBUG="" QMAKE_CFLAGS_RELEASE="" QMAKE_CXXFLAGS_DEBUG="" QMAKE_CXXFLAGS_RELEASE="" PREFIX="/usr/local" CONFIG+="release" CONFIG-="debug separate_debug_info" -recursive .. + qmake RAPIDJSON_SYSTEM=1 QMAKE_CC="cc" QMAKE_CXX="c++" QMAKE_LINK_C="cc" QMAKE_LINK_C_SHLIB="cc" QMAKE_LINK="c++" QMAKE_LINK_SHLIB="c++" QMAKE_CFLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " QMAKE_CXXFLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " QMAKE_LFLAGS="-fstack-protector-strong" QMAKE_LIBS="" QMAKE_CFLAGS_DEBUG="" QMAKE_CFLAGS_RELEASE="" QMAKE_CXXFLAGS_DEBUG="" QMAKE_CXXFLAGS_RELEASE="" PREFIX="/usr/local" CONFIG+="release" CONFIG-="debug separate_debug_info" -recursive .. make -j $(getconf _NPROCESSORS_ONLN) diff --git a/lib/qtkeychain.pri b/lib/qtkeychain.pri index 2ed6914fd..6c9daf46f 100644 --- a/lib/qtkeychain.pri +++ b/lib/qtkeychain.pri @@ -1 +1,6 @@ -include(qtkeychain/qt5keychain.pri) +freebsd { + INCLUDEPATH += /usr/local/include/qt5keychain + LIBS += -lqt5keychain +} else { + include(qtkeychain/qt5keychain.pri) +}