diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2022-06-11 17:26:12 +0000 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-06-11 17:26:12 +0000 |
| commit | 30252482402dd835989489bcc0e5494d030b1346 (patch) | |
| tree | ec106e1bfcf7b7d42fd6b8428f4083ecc1925bcf /anim | |
| parent | 5cbad4be539224068d34504df692974b17f49fa0 (diff) | |
a
Diffstat (limited to 'anim')
| -rw-r--r-- | anim/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | anim/serialize.cpp | 3 |
2 files changed, 9 insertions, 5 deletions
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 <algorithm> #include <utility> #include <fstream> #include <exception> + #include <Corrade/Utility/Debug.h> #include <Corrade/Utility/DebugStl.h> +#include <nlohmann/json.hpp> using Corrade::Utility::Error; |
