Skip to content

Commit

Permalink
Merge pull request #201 from mjh65/pr_issue181_xcode
Browse files Browse the repository at this point in the history
Update nlohmann/json submodule to v3.11.3.
  • Loading branch information
fpw authored Apr 22, 2024
2 parents 62bf60a + a1556e4 commit 107bbe9
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion lib/json
Submodule json updated 1434 files
4 changes: 0 additions & 4 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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 "")
Expand Down

0 comments on commit 107bbe9

Please sign in to comment.