From 30252482402dd835989489bcc0e5494d030b1346 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 11 Jun 2022 17:26:12 +0000 Subject: a --- anim/CMakeLists.txt | 11 +++++++---- anim/serialize.cpp | 3 ++- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'anim') diff --git a/anim/CMakeLists.txt b/anim/CMakeLists.txt index ae4bc542..bc148a06 100644 --- a/anim/CMakeLists.txt +++ b/anim/CMakeLists.txt @@ -1,9 +1,12 @@ find_package(OpenCV QUIET REQUIRED COMPONENTS core imgcodecs imgproc) +find_package(nlohmann_json QUIET REQUIRED) -file(GLOB sources "*.cpp" CONFIGURE_ARGS) set(self "${PROJECT_NAME}-anim") + +include_directories(SYSTEM PRIVATE ${OpenCV_INCLUDE_DIRS}) +link_libraries(opencv_imgproc opencv_imgcodecs opencv_core) +link_libraries(Magnum::Magnum nlohmann_json::nlohmann_json) + +file(GLOB sources "*.cpp" CONFIGURE_ARGS) add_library(${self} STATIC ${sources}) -target_include_directories(${self} SYSTEM PRIVATE ${OpenCV_INCLUDE_DIRS}) -target_link_libraries(${self} opencv_imgproc opencv_imgcodecs opencv_core) -target_link_libraries(${self} Magnum::Magnum) diff --git a/anim/serialize.cpp b/anim/serialize.cpp index 92ff1481..8743f41d 100644 --- a/anim/serialize.cpp +++ b/anim/serialize.cpp @@ -1,12 +1,13 @@ #include "serialize.hpp" -#include "json.hpp" #include #include #include #include + #include #include +#include using Corrade::Utility::Error; -- cgit v1.2.3