From 5388392cf024a058a8bb6eb2edaebd9e84832ecd Mon Sep 17 00:00:00 2001
From: Gus Grubba <mavlink@grubba.com>
Date: Mon, 26 Mar 2018 12:38:24 -0400
Subject: [PATCH] Update adding Linux build for Airmap

---
 QGCExternalLibs.pri                   | 6 ++++++
 libs/mavlink/include/mavlink/v2.0     | 2 +-
 src/Airmap/AirMapFlightPlanManager.cc | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
index 00ab50962..28f55173f 100644
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -161,6 +161,12 @@ contains (DEFINES, DISABLE_AIRMAP) {
                 LIBS += -L$${AIRMAPD_PATH}/macOS/Qt.5.9 -lairmap-qt
                 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 {
             message("Skipping support for Airmap (unsupported platform)")
         }
diff --git a/libs/mavlink/include/mavlink/v2.0 b/libs/mavlink/include/mavlink/v2.0
index f36b9c4c5..1b0dc4732 160000
--- a/libs/mavlink/include/mavlink/v2.0
+++ b/libs/mavlink/include/mavlink/v2.0
@@ -1 +1 @@
-Subproject commit f36b9c4c5c0c9b6d33621779469de0c1e7eea457
+Subproject commit 1b0dc4732864efadd72f9bfc89762bdb956c8638
diff --git a/src/Airmap/AirMapFlightPlanManager.cc b/src/Airmap/AirMapFlightPlanManager.cc
index 6dd79e333..3ead7ef49 100644
--- a/src/Airmap/AirMapFlightPlanManager.cc
+++ b/src/Airmap/AirMapFlightPlanManager.cc
@@ -435,7 +435,7 @@ AirMapFlightPlanManager::_updateRulesAndFeatures(std::vector<RuleSet::Id>& rules
                                     break;
                                 case AirspaceRuleFeature::Float:
                                     //-- 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());
                                     }
                                     break;
-- 
2.22.0