Merge pull request #182 from mjh65/pr_fix_build_mac_osx

Fix compile errors on Mac OSX
fpw · Nov 21, 2023 · 35d68bc · 35d68bc
2 parents fdd7faf + 195fda4
commit 35d68bc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,5 +1,9 @@
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -fPIC")
+if (APPLE)
+# This should be considered as a temporary fix until resolved in the nlohmann/json submodule
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
+endif()
 
 add_library(avitab_common "${CMAKE_CURRENT_LIST_DIR}/Logger.cpp")
 add_library(avitab_xplane "")

diff --git a/src/avitab/AviTab.h b/src/avitab/AviTab.h
@@ -61,7 +61,7 @@ class AviTab: public AppFunctions {
     void onHomeButton() override;
     std::shared_ptr<world::World> getNavWorld() override;
     using MagVarMap = std::map<std::pair<double, double>, double>;
-    MagVarMap getMagneticVariations(std::vector<std::pair<double, double>> locations);
+    MagVarMap getMagneticVariations(std::vector<std::pair<double, double>> locations) override;
     std::string getMETARForAirport(const std::string &icao) override;
     void reloadMetar() override;
     void loadUserFixes(std::string filename) override;

diff --git a/src/maps/OverlayedRoute.cpp b/src/maps/OverlayedRoute.cpp
@@ -18,6 +18,7 @@
 
 #include "OverlayedRoute.h"
 #include "src/Logger.h"
+#include <sstream>
 #include <iomanip>
 
 namespace maps {