From 7c8b0b19d3c049497612a21500340c0e52dc9a92 Mon Sep 17 00:00:00 2001 From: DreamSourceLab Date: Wed, 15 Oct 2014 21:19:39 +0800 Subject: [PATCH] fix compile error --- DSLogic-gui/CMakeLists.txt | 2 +- DSLogic-gui/pv/sigsession.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DSLogic-gui/CMakeLists.txt b/DSLogic-gui/CMakeLists.txt index 6f191121..32a56b48 100644 --- a/DSLogic-gui/CMakeLists.txt +++ b/DSLogic-gui/CMakeLists.txt @@ -34,7 +34,7 @@ project(DSLogic) option(DISABLE_WERROR "Build without -Werror" TRUE) 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) diff --git a/DSLogic-gui/pv/sigsession.cpp b/DSLogic-gui/pv/sigsession.cpp index 79c428d0..8a848617 100644 --- a/DSLogic-gui/pv/sigsession.cpp +++ b/DSLogic-gui/pv/sigsession.cpp @@ -125,7 +125,9 @@ void SigSession::set_device(shared_ptr dev_inst) throw(QString) } _dev_inst = dev_inst; +#ifdef ENABLE_DECODE _decode_traces.clear(); +#endif _group_traces.clear(); if (_dev_inst) {