X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=bef88ecbf5143e8af3d5aa413999748e5a45b440;hp=380f37a9320cb1567fb5cea95c4fd107f837e73b;hb=c9f573751bab3f53066aa87486f38216fde67ac8;hpb=5c3c8c1ef594dfd6acbac68684eba1a315de2dc1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 380f37a..bef88ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,18 +62,25 @@ if(NOT CMAKE_BUILD_TYPE)
 	FORCE)
 endif()
 
+#===============================================================================
+#= Documentation
+#-------------------------------------------------------------------------------
+
+add_subdirectory(manual)
+
 #===============================================================================
 #= Dependencies
 #-------------------------------------------------------------------------------
 
 list(APPEND PKGDEPS glib-2.0>=2.28.0)
 list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
+list(APPEND PKGDEPS gstreamermm-1.0>=1.8.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 libsigrokdecode>=0.6.0)
+	list(APPEND PKGDEPS libsigrokdecode>=0.5.2)
 endif()
 
 if(ANDROID)
@@ -81,7 +88,7 @@ if(ANDROID)
 endif()
 
 find_package(PkgConfig)
-pkg_check_modules(LIBSRCXX QUIET ${LIBSR_CXX_BINDING})
+pkg_check_modules(LIBSRCXX ${LIBSR_CXX_BINDING})
 if(NOT LIBSRCXX_FOUND OR NOT LIBSRCXX_VERSION)
 	message(FATAL_ERROR "libsigrok C++ bindings missing, check libsigrok's 'configure' output (missing dependencies?)")
 endif()
@@ -191,6 +198,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()
+
+	# 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]*)?$")