Use more specific libsigrokcxx/libsigrokdecode minimum versions.

We require libsigrokcxx >= 0.5.1 e.g. due to Analog::get_logic_via_threshold(),
and libsigrokdecode >= 0.5.2 due to e.g. srd_log_callback_get().

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc642c4e218b18ffca9b885e34b4b790bad2d0c3..b74792de7a1d33b3267867f291ea04d3bf0fbce7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,11 +75,11 @@ add_subdirectory(manual)
 list(APPEND PKGDEPS glib-2.0>=2.28.0)
 list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
 
 list(APPEND PKGDEPS glib-2.0>=2.28.0)
 list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
 

-set(LIBSR_CXX_BINDING "libsigrokcxx>=0.6.0")
+set(LIBSR_CXX_BINDING "libsigrokcxx>=0.5.1")

 list(APPEND PKGDEPS "${LIBSR_CXX_BINDING}")
 
 if(ENABLE_DECODE)
 list(APPEND PKGDEPS "${LIBSR_CXX_BINDING}")
 
 if(ENABLE_DECODE)

-       list(APPEND PKGDEPS libsigrokdecode>=0.6.0)
+       list(APPEND PKGDEPS libsigrokdecode>=0.5.2)

 endif()
 
 if(ANDROID)
 endif()
 
 if(ANDROID)

diff --git a/INSTALL b/INSTALL
index b51b246ebf3ea492a378f0cb762b5869e34909fe..8bf8ef18184577914e98ef31b8603bfe8a98cbaa 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -23,8 +23,8 @@ 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)

- - libsigrokcxx >= 0.6.0 (libsigrok C++ bindings)
- - libsigrokdecode >= 0.6.0
+ - libsigrokcxx >= 0.5.1 (libsigrok C++ bindings)
+ - libsigrokdecode >= 0.5.2

  - libsigrokandroidutils >= 0.1.0 (optional, only needed on Android)
  - Asciidoctor (optional, only needed to build the manual)
 
  - libsigrokandroidutils >= 0.1.0 (optional, only needed on Android)
  - Asciidoctor (optional, only needed to build the manual)