Commit 0d59284e authored by Lorenz Meier's avatar Lorenz Meier

Check for the submodule

parent 21e8b4f4
...@@ -107,7 +107,9 @@ else { ...@@ -107,7 +107,9 @@ else {
# Then we add the proper include paths dependent on the dialect. # Then we add the proper include paths dependent on the dialect.
INCLUDEPATH += $$MAVLINKPATH INCLUDEPATH += $$MAVLINKPATH
!isEmpty(MAVLINK_CONF) {
exists($$MAVLINKPATH/common) {
!isEmpty(MAVLINK_CONF) {
count(MAVLINK_CONF, 1) { count(MAVLINK_CONF, 1) {
exists($$MAVLINKPATH/$$MAVLINK_CONF) { exists($$MAVLINKPATH/$$MAVLINK_CONF) {
INCLUDEPATH += $$MAVLINKPATH/$$MAVLINK_CONF INCLUDEPATH += $$MAVLINKPATH/$$MAVLINK_CONF
...@@ -118,9 +120,12 @@ INCLUDEPATH += $$MAVLINKPATH ...@@ -118,9 +120,12 @@ INCLUDEPATH += $$MAVLINKPATH
} else { } else {
error(Only a single mavlink dialect can be specified in MAVLINK_CONF) error(Only a single mavlink dialect can be specified in MAVLINK_CONF)
} }
} else { } else {
warning("No MAVLink dialect specified, only common messages supported.") warning("No MAVLink dialect specified, only common messages supported.")
INCLUDEPATH += $$MAVLINKPATH/common INCLUDEPATH += $$MAVLINKPATH/common
}
} else {
error($$sprintf("MAVLink folder does not exist at '%1'! Run 'git submodule init && git submodule update' on the command line.",$$MAVLINKPATH_REL))
} }
# #
......
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