Build gcc 9 and fix install path
This commit is contained in:
parent
29c44d4669
commit
70ec8280ad
1
debian/control
vendored
1
debian/control
vendored
@ -5,7 +5,6 @@ Maintainer: Simon Stürz <simon.stuerz@nymea.io>
|
|||||||
Build-Depends: debhelper (>= 9.0.0),
|
Build-Depends: debhelper (>= 9.0.0),
|
||||||
dpkg-dev (>= 1.16.1~),
|
dpkg-dev (>= 1.16.1~),
|
||||||
qt5-default,
|
qt5-default,
|
||||||
qt5-qmake,
|
|
||||||
qtbase5-dev,
|
qtbase5-dev,
|
||||||
qtbase5-dev-tools
|
qtbase5-dev-tools
|
||||||
Standards-Version: 3.9.7
|
Standards-Version: 3.9.7
|
||||||
|
|||||||
@ -15,5 +15,5 @@ HEADERS += \
|
|||||||
SOURCES += main.cpp \
|
SOURCES += main.cpp \
|
||||||
application.cpp
|
application.cpp
|
||||||
|
|
||||||
target.path = /usr/bin
|
target.path = $$[QT_INSTALL_PREFIX]/bin
|
||||||
INSTALLS += target
|
INSTALLS += target
|
||||||
|
|||||||
@ -2,6 +2,12 @@
|
|||||||
QMAKE_CXXFLAGS += -Werror -std=c++11 -g
|
QMAKE_CXXFLAGS += -Werror -std=c++11 -g
|
||||||
QMAKE_LFLAGS += -std=c++11
|
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
|
QT -= gui
|
||||||
|
|
||||||
top_srcdir=$$PWD
|
top_srcdir=$$PWD
|
||||||
|
|||||||
Reference in New Issue
Block a user