From c941e9d35a56209b42250343d658ec8ea13ce7a1 Mon Sep 17 00:00:00 2001 From: Markus Schmidl Date: Sun, 5 Jan 2025 18:02:59 +0100 Subject: [PATCH] link against armadillo --- CMakeLists.txt | 6 ++++-- derivation.nix | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 79898ff..4729726 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,14 +61,16 @@ find_package(fmt REQUIRED) find_package(nlohmann_json REQUIRED) find_package(prometheus-cpp CONFIG REQUIRED) find_package(cpr REQUIRED) - +find_package(Armadillo REQUIRED) + +include_directories(${ARMADILLO_INCLUDE_DIRS}) include_directories(${CMAKE_SOURCE_DIR}/include) if (NOT NIX_BUILD) target_link_libraries(tetra-decoder-library cxxopts::cxxopts) endif() -target_link_libraries(tetra-decoder-library ZLIB::ZLIB fmt::fmt nlohmann_json::nlohmann_json viterbi prometheus-cpp::pull cpr::cpr) +target_link_libraries(tetra-decoder-library ZLIB::ZLIB fmt::fmt nlohmann_json::nlohmann_json viterbi prometheus-cpp::pull cpr::cpr ${ARMADILLO_LIBRARIES}) target_link_libraries(tetra-decoder tetra-decoder-library) target_link_libraries(tetra-viterbi viterbi) diff --git a/derivation.nix b/derivation.nix index e33acd3..7bac3d4 100644 --- a/derivation.nix +++ b/derivation.nix @@ -8,6 +8,7 @@ , prometheus-cpp , curlFull , libcpr +, armadillo }: clangStdenv.mkDerivation { name = "tetra-decoder"; @@ -23,6 +24,7 @@ clangStdenv.mkDerivation { curlFull prometheus-cpp libcpr + armadillo ]; cmakeFlags = [ "-DNIX_BUILD=ON" ];