light7734/light
light7734/light
1
1
Fork 0
Code Issues 20 Pull requests 1 Projects 1 Releases Packages Wiki Activity

refactor: remove nlohmann::json dependency
Some checks reported errors
continuous-integration/drone/push Build was killed
Details

Browse source
This commit is contained in:
light7734 2025-07-16 13:27:27 +03:30
parent 3cc3da4dbe
commit c3e7469313
Signed by: light7734
GPG key ID: 8C30176798F1A6BA
5 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
conanfile.py
View file

@ -31,7 +31,6 @@ class LightRecipe(ConanFile):
self.requires("stb/cci.20240531") self.requires("stb/cci.20240531")
self.requires("volk/1.3.296.0") self.requires("volk/1.3.296.0")
self.requires("yaml-cpp/0.8.0") self.requires("yaml-cpp/0.8.0")
self.requires("nlohmann_json/3.12.0")
self.requires("lz4/1.10.0") self.requires("lz4/1.10.0")
def layout(self): def layout(self):

5
modules/asset_parser/CMakeLists.txt
View file

@ -6,7 +6,6 @@ add_library_module(asset_parser
target_link_libraries( target_link_libraries(
asset_parser asset_parser
PUBLIC LZ4::lz4_static PRIVATE LZ4::lz4_static
PUBLIC nlohmann_json::nlohmann_json PRIVATE logger
PUBLIC logger
) )

1
modules/asset_parser/src/assets/text.cpp
View file

@ -1,6 +1,5 @@
#include <asset_parser/assets/text.hpp> #include <asset_parser/assets/text.hpp>
#include <lz4.h> #include <lz4.h>
#include <nlohmann/json.hpp>
namespace Assets { namespace Assets {

1
modules/asset_parser/src/assets/texture.cpp
View file

@ -1,6 +1,5 @@
#include <asset_parser/assets/texture.hpp> #include <asset_parser/assets/texture.hpp>
#include <lz4.h> #include <lz4.h>
#include <nlohmann/json.hpp>
namespace Assets { namespace Assets {

1
tools/cmake/dependencies.cmake
View file

@ -5,5 +5,4 @@ find_package(stb REQUIRED)
find_package(yaml-cpp REQUIRED) find_package(yaml-cpp REQUIRED)
find_package(EnTT REQUIRED) find_package(EnTT REQUIRED)
find_package(opengl_system REQUIRED) find_package(opengl_system REQUIRED)
find_package(nlohmann_json REQUIRED)
find_package(lz4 REQUIRED) find_package(lz4 REQUIRED)