From 70ec8280ade20019e95e335f5f27c23e499ca202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Sun, 5 Sep 2021 12:58:29 +0200 Subject: [PATCH] Build gcc 9 and fix install path --- debian/control | 1 - nymea-gpio-tool/nymea-gpio-tool.pro | 2 +- nymea-gpio.pri | 6 ++++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 06579e7..1d00878 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Simon Stürz Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~), qt5-default, - qt5-qmake, qtbase5-dev, qtbase5-dev-tools Standards-Version: 3.9.7 diff --git a/nymea-gpio-tool/nymea-gpio-tool.pro b/nymea-gpio-tool/nymea-gpio-tool.pro index 2e6a605..99b0ec1 100644 --- a/nymea-gpio-tool/nymea-gpio-tool.pro +++ b/nymea-gpio-tool/nymea-gpio-tool.pro @@ -15,5 +15,5 @@ HEADERS += \ SOURCES += main.cpp \ application.cpp -target.path = /usr/bin +target.path = $$[QT_INSTALL_PREFIX]/bin INSTALLS += target diff --git a/nymea-gpio.pri b/nymea-gpio.pri index f6dcac7..c95128d 100644 --- a/nymea-gpio.pri +++ b/nymea-gpio.pri @@ -2,6 +2,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 +} + QT -= gui top_srcdir=$$PWD