Skip to content

Q
qgroundcontrol
Commit 51faca98 authored by Daniel Agar's avatar Daniel Agar
Browse files
Options

qmake use absolute paths instead of relative

parent 3c36e26a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
qgroundcontrol.pro
View file @ 51faca98
...@@ -7,14 +7,16 @@ ...@@ -7,14 +7,16 @@
# License terms set in COPYING.md # License terms set in COPYING.md
# ------------------------------------------------- # -------------------------------------------------
QMAKE_PROJECT_DEPTH = 0 # undocumented qmake flag to force absolute paths in make files
exists($${OUT_PWD}/qgroundcontrol.pro) { exists($${OUT_PWD}/qgroundcontrol.pro) {
error("You must use shadow build (e.g. mkdir build; cd build; qmake ../qgroundcontrol.pro).") error("You must use shadow build (e.g. mkdir build; cd build; qmake ../qgroundcontrol.pro).")
} }
message(Qt version $$[QT_VERSION]) message(Qt version $$[QT_VERSION])
!equals(QT_MAJOR_VERSION, 5) | !greaterThan(QT_MINOR_VERSION, 6) { !equals(QT_MAJOR_VERSION, 5) | !greaterThan(QT_MINOR_VERSION, 8) {
error("Unsupported Qt version, 5.7+ is required") error("Unsupported Qt version, 5.9+ is required")
} }
include(QGCCommon.pri) include(QGCCommon.pri)
...@@ -207,8 +209,7 @@ contains(DEFINES, ENABLE_VERBOSE_OUTPUT) { ...@@ -207,8 +209,7 @@ contains(DEFINES, ENABLE_VERBOSE_OUTPUT) {
} else:exists(user_config.pri):infile(user_config.pri, DEFINES, ENABLE_VERBOSE_OUTPUT) { } else:exists(user_config.pri):infile(user_config.pri, DEFINES, ENABLE_VERBOSE_OUTPUT) {
message("Enable verbose compiler output (manual override from user_config.pri)") message("Enable verbose compiler output (manual override from user_config.pri)")
} else { } else {
CONFIG += \ CONFIG += silent
silent
} }
QT += \ QT += \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment