projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aa1a1bc
)
INSTALL: Update and fix build requirements.
author
Uwe Hermann
<uwe@hermann-uwe.de>
Sat, 29 Nov 2014 15:05:07 +0000
(16:05 +0100)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Sat, 29 Nov 2014 15:05:49 +0000
(16:05 +0100)
INSTALL
patch
|
blob
|
history
diff --git
a/INSTALL
b/INSTALL
index 18513ae6387643ad61e8603e485dbdb3e285b0ca..ba494819b6a001c7d304f4c6c472ea3f992549d1 100644
(file)
--- a/
INSTALL
+++ b/
INSTALL
@@
-14,7
+14,9
@@
Requirements
- pkg-config >= 0.22
- cmake >= 2.8.6
- libglib >= 2.28.0
- pkg-config >= 0.22
- cmake >= 2.8.6
- libglib >= 2.28.0
- - Qt >= 4.5
+ - Qt4 >= 4.5 or Qt5 (including the following components):
+ - Qt4: QtCore, QtGui, QtSvg
+ - Qt5: Qt5Core, Qt5Gui, Qt5Widgets, Qt5Svg
- libboost >= 1.42 (including the following libs):
- libboost-system
- libboost-filesystem
- libboost >= 1.42 (including the following libs):
- libboost-system
- libboost-filesystem
@@
-22,6
+24,7
@@
Requirements
- libboost-test (optional, only needed to run the unit tests)
- libsigrokxx >= 0.3.0 (libsigrok C++ bindings)
- libsigrokdecode >= 0.3.0
- libboost-test (optional, only needed to run the unit tests)
- libsigrokxx >= 0.3.0 (libsigrok C++ bindings)
- libsigrokdecode >= 0.3.0
+ - libsigrokandroidutils >= 0.1.0 (optional, only needed on Android)
Building and installing
Building and installing