projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use more specific libsigrokcxx/libsigrokdecode minimum versions.
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 64538f5b338522192f7098fadf60a61acee8d899..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)
@@
-197,6
+197,12
@@
if(NOT PV_TAG_VERSION_STRING)
string(SUBSTRING "${PV_HASH}" 0 7 PV_SHORTHASH)
set(PV_VERSION_STRING "${PV_VERSION_STRING}-git-${PV_SHORTHASH}")
endif()
string(SUBSTRING "${PV_HASH}" 0 7 PV_SHORTHASH)
set(PV_VERSION_STRING "${PV_VERSION_STRING}-git-${PV_SHORTHASH}")
endif()
+
+ # Non-tagged releases use the unstable manual
+ set(PV_MANUAL_VERSION "unstable")
+else()
+ # Tagged releases use a fixed manual version
+ set(PV_MANUAL_VERSION ${PV_VERSION_STRING})
endif()
if(PV_VERSION_STRING MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-[-0-9a-z]*)?$")
endif()
if(PV_VERSION_STRING MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-[-0-9a-z]*)?$")