diff --git a/lib/json b/lib/json index e7452d87..0457de21 160000 --- a/lib/json +++ b/lib/json @@ -1 +1 @@ -Subproject commit e7452d87783fbf6e9d320d515675e26dfd1271c5 +Subproject commit 0457de21cffb298c22b629e538036bfeb96130b7 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 91495964..20fb1e11 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,9 +1,5 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wno-conversion -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 "")