projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4506632
)
Build-depend on the upcoming libsigrok + libsigrokdecode 0.4.0.
author
Uwe Hermann
<uwe@hermann-uwe.de>
Sat, 18 Jul 2015 16:08:24 +0000
(18:08 +0200)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Sat, 18 Jul 2015 16:08:24 +0000
(18:08 +0200)
CMakeLists.txt
patch
|
blob
|
history
INSTALL
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index fa9d0b450fd152c0c0e9d1230c49bbe7a7cfd64b..15902c805f8836e056da85f6e71cd5c2f6d6017d 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-65,10
+65,10
@@
endif()
#= Dependencies
#-------------------------------------------------------------------------------
#= Dependencies
#-------------------------------------------------------------------------------
-list(APPEND PKGDEPS libsigrokcxx>=0.
3
.0)
+list(APPEND PKGDEPS libsigrokcxx>=0.
4
.0)
if(ENABLE_DECODE)
if(ENABLE_DECODE)
- list(APPEND PKGDEPS libsigrokdecode>=0.
3
.0)
+ list(APPEND PKGDEPS libsigrokdecode>=0.
4
.0)
endif()
if(ANDROID)
endif()
if(ANDROID)
diff --git
a/INSTALL
b/INSTALL
index 6109714e278eb0066d295062b16c819530a4b843..746064be82546e428b116e37e1ef9ae269b19582 100644
(file)
--- a/
INSTALL
+++ b/
INSTALL
@@
-22,8
+22,8
@@
Requirements
- libboost-filesystem
- libboost-thread
- libboost-test (optional, only needed to run the unit tests)
- libboost-filesystem
- libboost-thread
- libboost-test (optional, only needed to run the unit tests)
- - libsigrokcxx >= 0.
3
.0 (libsigrok C++ bindings)
- - libsigrokdecode >= 0.
3
.0
+ - libsigrokcxx >= 0.
4
.0 (libsigrok C++ bindings)
+ - libsigrokdecode >= 0.
4
.0
- libsigrokandroidutils >= 0.1.0 (optional, only needed on Android)
- libsigrokandroidutils >= 0.1.0 (optional, only needed on Android)