Skip to content

Commit

Permalink
remove nlohmann json submodule and add header directly instead
Browse files Browse the repository at this point in the history
- There were random git submodule checkout errors in MAVSDK CI for that
  repo. It's not clear why, but a reason could be that the repo is large.
- One of the repo file names is too long and causes failures on Windows 10.
  mavlink/qgroundcontrol#11747
  • Loading branch information
bkueng committed Aug 22, 2024
1 parent ce60064 commit 7c17207
Show file tree
Hide file tree
Showing 7 changed files with 24,946 additions and 9 deletions.
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

6 changes: 3 additions & 3 deletions libs/cpp/parse/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ install(TARGETS libevents_parser

add_library(nlohmann_json
INTERFACE
nlohmann_json/single_include/nlohmann/json_fwd.hpp
nlohmann/json_fwd.hpp
)
set_target_properties(nlohmann_json PROPERTIES PUBLIC_HEADER
nlohmann_json/single_include/nlohmann/json_fwd.hpp)
nlohmann/json_fwd.hpp)
install(TARGETS nlohmann_json
EXPORT libevents
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libevents/parse/nlohmann_json/single_include/nlohmann)
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libevents/parse/nlohmann)

add_library(libevents_health_and_arming_checks
health_and_arming_checks.cpp
Expand Down
Loading

0 comments on commit 7c17207

Please sign in to comment.