Merge remote-tracking branch 'origin/binary_buffer' into binary_buffer

# Conflicts: # sf-stream/src/main.cpp
2026-04-30 21:12:24 +02:00 · 2020-06-02 10:22:04 +02:00
parent c0ef365628 dce0cc1628
commit 5abed9a2ad
1 changed files with 3 additions and 2 deletions
@@ -13,7 +13,8 @@ target_link_libraries(sf-stream
        external
        sf-stream-lib
        zmq
-        pthread)
+        pthread
+        jsoncpp)

 enable_testing()
-add_subdirectory(test/)
+add_subdirectory(test/)