From 5bf7c676d03a9dc3aec5b125ca6576a665ab2887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Mon, 26 Jul 2021 13:10:47 +0200 Subject: [PATCH] Enable building with gcc >= 9 and fix server install path --- nymea-mqtt.pri | 6 ++++++ server/server.pro | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nymea-mqtt.pri b/nymea-mqtt.pri index e83601a..7aebeb2 100644 --- a/nymea-mqtt.pri +++ b/nymea-mqtt.pri @@ -1,6 +1,12 @@ QMAKE_CXXFLAGS *= -Werror -std=c++11 -g QMAKE_LFLAGS *= -std=c++11 +gcc { + COMPILER_VERSION = $$system($$QMAKE_CXX " -dumpversion") + COMPILER_MAJOR_VERSION = $$str_member($$COMPILER_VERSION) + greaterThan(COMPILER_MAJOR_VERSION, 7): QMAKE_CXXFLAGS += -Wno-deprecated-copy +} + top_srcdir=$$PWD top_builddir=$$shadowed($$PWD) diff --git a/server/server.pro b/server/server.pro index 6894291..1d870bc 100644 --- a/server/server.pro +++ b/server/server.pro @@ -12,5 +12,5 @@ SOURCES += main.cpp LIBS += -L$$top_builddir/libnymea-mqtt/ -lnymea-mqtt -target.path = /usr/bin/ +target.path = $$[QT_INSTALL_PREFIX]/bin/ INSTALLS += target