From d93ac5e8770e9e5c7bf64d0ed7961357e04370ba Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Fri, 26 May 2017 17:56:08 +0200 Subject: [PATCH] build: Add missing check for glibmm. Also, list the glibmm version in config.h. --- CMakeLists.txt | 4 ++++ config.h.in | 2 ++ 2 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45055ab8..31b45ef5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,8 @@ endif() #= Dependencies #------------------------------------------------------------------------------- +list(APPEND PKGDEPS glibmm-2.4>=2.28.0) + list(APPEND PKGDEPS libsigrokcxx>=0.4.0) if(ENABLE_DECODE) @@ -153,6 +155,8 @@ set(PV_TITLE PulseView) set(PV_DESCRIPTION "A GUI for sigrok") set(PV_VERSION_STRING "0.4.0") +set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION}) + include(GetGitRevisionDescription) # Append the revision hash unless we are exactly on a tagged release. diff --git a/config.h.in b/config.h.in index 8da6dafb..8148ce1f 100644 --- a/config.h.in +++ b/config.h.in @@ -35,4 +35,6 @@ /* Platform properties */ #cmakedefine HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS +#define PV_GLIBMM_VERSION "@PV_GLIBMM_VERSION@" + #endif -- 2.11.4.GIT