diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b93c1a41..dd189533 100644 --- 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 index bcbd76a9..3a988a82 100644 --- a/src/avitab/AviTab.h +++ b/src/avitab/AviTab.h @@ -61,7 +61,7 @@ class AviTab: public AppFunctions { void onHomeButton() override; std::shared_ptr getNavWorld() override; using MagVarMap = std::map, double>; - MagVarMap getMagneticVariations(std::vector> locations); + MagVarMap getMagneticVariations(std::vector> 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 index e7e99418..e7102350 100644 --- a/src/maps/OverlayedRoute.cpp +++ b/src/maps/OverlayedRoute.cpp @@ -18,6 +18,7 @@ #include "OverlayedRoute.h" #include "src/Logger.h" +#include #include namespace maps {