X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=a6a6c406a00b6765d56c0db992c74529f9afd1b0;hb=f0c9f81c03d2c1d1fa59c357a88d25f6a3128651;hp=1b9c7d1a2b50fb3106a61c11e81c90df49ff87a7;hpb=03e8c9914eeadadd6f54aa32f55f5c08bd27c426;p=pulseview.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b9c7d1..a6a6c40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ project(pulseview) option(DISABLE_WERROR "Build without -Werror" FALSE) option(ENABLE_SIGNALS "Build with UNIX signals" TRUE) -option(ENABLE_DECODE "Build with libsigrokdecode" FALSE) +option(ENABLE_DECODE "Build with libsigrokdecode" TRUE) option(ENABLE_COTIRE "Enable cotire" FALSE) option(ENABLE_TESTS "Enable unit tests" FALSE) option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE) @@ -61,10 +61,10 @@ endif() #= Dependencies #------------------------------------------------------------------------------- -list(APPEND PKGDEPS libsigrok>=0.2.0) +list(APPEND PKGDEPS libsigrok>=0.3.0) if(ENABLE_DECODE) - list(APPEND PKGDEPS libsigrokdecode>=0.2.0) + list(APPEND PKGDEPS libsigrokdecode>=0.3.0) endif() find_package(PkgConfig) @@ -100,7 +100,7 @@ set(PV_TITLE PulseView) set(PV_DESCRIPTION "A GUI for sigrok") set(PV_VERSION_MAJOR 0) -set(PV_VERSION_MINOR 1) +set(PV_VERSION_MINOR 2) set(PV_VERSION_MICRO 0) set(PV_VERSION_STRING ${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO} @@ -121,6 +121,7 @@ set(pulseview_SOURCES pv/mainwindow.cpp pv/sigsession.cpp pv/storesession.cpp + pv/util.cpp pv/data/analog.cpp pv/data/analogsnapshot.cpp pv/data/logic.cpp