Merge branch 'master' into deploy-network-information-plugins

zakalawe · web-flow · commit e11cdcb04afb · 2026-05-14T15:03:07.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,8 +27,6 @@ if(NOT nlohmann_json_FOUND)
     )
 
     FetchContent_MakeAvailable(nlohmann_json)
-
-    add_library(nlohmann_json::nlohmann_json ALIAS nlohmann_json)
 endif()
 
 add_subdirectory(lib)

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,6 @@ if(NOT nlohmann_json_FOUND)`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`FetchContent_MakeAvailable(nlohmann_json)`
`30`		`-`
`31`		`- add_library(nlohmann_json::nlohmann_json ALIAS nlohmann_json)`
`32`	`30`	`endif()`
`33`	`31`
`34`	`32`	`add_subdirectory(lib)`