diff --git a/conanfile.py b/conanfile.py index 6f918fe..849bbf8 100644 --- a/conanfile.py +++ b/conanfile.py @@ -31,7 +31,6 @@ class LightRecipe(ConanFile): self.requires("stb/cci.20240531") self.requires("volk/1.3.296.0") self.requires("yaml-cpp/0.8.0") - self.requires("nlohmann_json/3.12.0") self.requires("lz4/1.10.0") def layout(self): diff --git a/modules/asset_parser/CMakeLists.txt b/modules/asset_parser/CMakeLists.txt index bea89d5..4ebd2a8 100644 --- a/modules/asset_parser/CMakeLists.txt +++ b/modules/asset_parser/CMakeLists.txt @@ -6,7 +6,6 @@ add_library_module(asset_parser target_link_libraries( asset_parser - PUBLIC LZ4::lz4_static - PUBLIC nlohmann_json::nlohmann_json - PUBLIC logger + PRIVATE LZ4::lz4_static + PRIVATE logger ) diff --git a/modules/asset_parser/src/assets/text.cpp b/modules/asset_parser/src/assets/text.cpp index 985e9d2..de31041 100644 --- a/modules/asset_parser/src/assets/text.cpp +++ b/modules/asset_parser/src/assets/text.cpp @@ -1,6 +1,5 @@ #include #include -#include namespace Assets { diff --git a/modules/asset_parser/src/assets/texture.cpp b/modules/asset_parser/src/assets/texture.cpp index 147ecb3..97b8012 100644 --- a/modules/asset_parser/src/assets/texture.cpp +++ b/modules/asset_parser/src/assets/texture.cpp @@ -1,6 +1,5 @@ #include #include -#include namespace Assets { diff --git a/tools/cmake/dependencies.cmake b/tools/cmake/dependencies.cmake index 97676cd..5d4554f 100644 --- a/tools/cmake/dependencies.cmake +++ b/tools/cmake/dependencies.cmake @@ -5,5 +5,4 @@ find_package(stb REQUIRED) find_package(yaml-cpp REQUIRED) find_package(EnTT REQUIRED) find_package(opengl_system REQUIRED) -find_package(nlohmann_json REQUIRED) find_package(lz4 REQUIRED)