Add libsigrokflow build system integration.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b347092f4297308419c42d64c2864b98fb18b05..55b03e5b66ea97cf840833a66f3ebd33b929a3c0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,6 +78,7 @@ list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
 
 if(ENABLE_GSTREAMERMM)
        list(APPEND PKGDEPS gstreamermm-1.0>=1.8.0)
 
 if(ENABLE_GSTREAMERMM)
        list(APPEND PKGDEPS gstreamermm-1.0>=1.8.0)

+       list(APPEND PKGDEPS libsigrokflow>=0.1.0)

 endif()
 
 set(LIBSR_CXX_BINDING "libsigrokcxx>=0.5.1")
 endif()
 
 set(LIBSR_CXX_BINDING "libsigrokcxx>=0.5.1")

diff --git a/INSTALL b/INSTALL
index c68d575d4d8277f8c8dec2d9f1ec8967ff31bce2..7fb9f7305c1e152f9f76fb5f68165a9ca746ba4e 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -24,6 +24,7 @@ Requirements
     - libboost-serialization
     - libboost-test (optional, only needed to run the unit tests)
     - libboost-stacktrace (optional, only needed for debugging)
     - libboost-serialization
     - libboost-test (optional, only needed to run the unit tests)
     - libboost-stacktrace (optional, only needed for debugging)

+ - libsigrokflow >= 0.1.0

  - libsigrokcxx >= 0.5.1 (libsigrok C++ bindings)
  - libsigrokdecode >= 0.5.2
  - libsigrokandroidutils >= 0.1.0 (optional, only needed on Android)
  - libsigrokcxx >= 0.5.1 (libsigrok C++ bindings)
  - libsigrokdecode >= 0.5.2
  - libsigrokandroidutils >= 0.1.0 (optional, only needed on Android)

diff --git a/main.cpp b/main.cpp
index 857c36a9c224567f78cd055a70df2566ffdbe2ad..a4c7e72badfd6fb4fca88e3cf559d47c5a4586da 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -28,6 +28,7 @@
 
 #ifdef ENABLE_GSTREAMERMM
 #include <gstreamermm.h>
 
 #ifdef ENABLE_GSTREAMERMM
 #include <gstreamermm.h>

+#include <libsigrokflow/libsigrokflow.hpp>

 #endif
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 #endif
 
 #include <libsigrokcxx/libsigrokcxx.hpp>