Skip to content

Q
qgroundcontrol
Commit 5388392c authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

Update adding Linux build for Airmap

parent f4131710
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
QGCExternalLibs.pri
View file @ 5388392c
...@@ -161,6 +161,12 @@ contains (DEFINES, DISABLE_AIRMAP) { ...@@ -161,6 +161,12 @@ contains (DEFINES, DISABLE_AIRMAP) {
LIBS += -L$${AIRMAPD_PATH}/macOS/Qt.5.9 -lairmap-qt LIBS += -L$${AIRMAPD_PATH}/macOS/Qt.5.9 -lairmap-qt
DEFINES += QGC_AIRMAP_ENABLED DEFINES += QGC_AIRMAP_ENABLED
} }
} else:LinuxBuild {
exists($${AIRMAPD_PATH}/linux/Qt.5.9) {
message("Including support for AirMap for Linux")
LIBS += -L$${AIRMAPD_PATH}/linux/Qt.5.9 -lairmap-qt
DEFINES += QGC_AIRMAP_ENABLED
}
} else { } else {
message("Skipping support for Airmap (unsupported platform)") message("Skipping support for Airmap (unsupported platform)")
} }
......
v2.0 @ 1b0dc473
Subproject commit f36b9c4c5c0c9b6d33621779469de0c1e7eea457 Subproject commit 1b0dc4732864efadd72f9bfc89762bdb956c8638
src/Airmap/AirMapFlightPlanManager.cc
View file @ 5388392c
...@@ -435,7 +435,7 @@ AirMapFlightPlanManager::_updateRulesAndFeatures(std::vector<RuleSet::Id>& rules ...@@ -435,7 +435,7 @@ AirMapFlightPlanManager::_updateRulesAndFeatures(std::vector<RuleSet::Id>& rules
break; break;
case AirspaceRuleFeature::Float: case AirspaceRuleFeature::Float:
//-- Sanity check for floats //-- Sanity check for floats
if(isfinite(feature->value().toFloat())) { if(std::isfinite(feature->value().toFloat())) {
features[feature->name().toStdString()] = RuleSet::Feature::Value(feature->value().toFloat()); features[feature->name().toStdString()] = RuleSet::Feature::Value(feature->value().toFloat());
} }
break; break;
......
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