Implemented a global decode lock to prevent concurrent decode

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01c3660d9cf86fecd87ea11eeea4fee228787ded..2ea44dba08084bf4d3bcc15f385f3d5ea7c1f873 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.6)
 
 include(FindPkgConfig)
 include(GNUInstallDirs)
@@ -34,7 +34,6 @@ project(pulseview)
 
 option(DISABLE_WERROR "Build without -Werror" FALSE)
 option(ENABLE_SIGNALS "Build with UNIX signals" TRUE)
-option(ENABLE_SIGROKDECODE "Build with libsigrokdecode" FALSE)
 option(ENABLE_TESTS "Enable unit tests" FALSE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE)
 
@@ -57,12 +56,9 @@ endif()
 
 list(APPEND PKGDEPS
        libsigrok>=0.2.0
+       libsigrokdecode>=0.2.0
 )
 
-if(ENABLE_SIGROKDECODE)
-       list(APPEND PKGDEPS libsigrokdecode>=0.2.0)
-endif()
-
 find_package(PkgConfig)
 pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
 
@@ -111,25 +107,30 @@ set(pulseview_SOURCES
        pv/sigsession.cpp
        pv/data/analog.cpp
        pv/data/analogsnapshot.cpp
+       pv/data/decoder.cpp
        pv/data/logic.cpp
        pv/data/logicsnapshot.cpp
        pv/data/signaldata.cpp
        pv/data/snapshot.cpp
        pv/dialogs/about.cpp
        pv/dialogs/connect.cpp
-       pv/dialogs/deviceoptions.cpp
+       pv/dialogs/decoder.cpp
+       pv/popups/deviceoptions.cpp
+       pv/popups/probes.cpp
        pv/prop/bool.cpp
        pv/prop/double.cpp
        pv/prop/enum.cpp
        pv/prop/int.cpp
        pv/prop/property.cpp
+       pv/prop/string.cpp
        pv/prop/binding/binding.cpp
+       pv/prop/binding/decoderoptions.cpp
        pv/prop/binding/deviceoptions.cpp
-       pv/toolbars/contextbar.cpp
        pv/toolbars/samplingbar.cpp
        pv/view/analogsignal.cpp
        pv/view/cursor.cpp
        pv/view/cursorpair.cpp
+       pv/view/decodesignal.cpp
        pv/view/header.cpp
        pv/view/marginwidget.cpp
        pv/view/logicsignal.cpp
@@ -138,20 +139,35 @@ set(pulseview_SOURCES
        pv/view/signal.cpp
        pv/view/timemarker.cpp
        pv/view/trace.cpp
+       pv/view/tracepalette.cpp
        pv/view/view.cpp
        pv/view/viewport.cpp
+       pv/view/decode/annotation.cpp
+       pv/widgets/colourbutton.cpp
+       pv/widgets/colourpopup.cpp
+       pv/widgets/popup.cpp
+       pv/widgets/popuptoolbutton.cpp
+       pv/widgets/wellarray.cpp
 )
 
 # This list includes only QObject derrived class headers
 set(pulseview_HEADERS
        pv/mainwindow.h
        pv/sigsession.h
+       pv/data/decoder.h
        pv/dialogs/about.h
        pv/dialogs/connect.h
-       pv/dialogs/deviceoptions.h
-       pv/toolbars/contextbar.h
+       pv/popups/deviceoptions.h
+       pv/popups/probes.h
+       pv/prop/bool.h
+       pv/prop/double.h
+       pv/prop/enum.h
+       pv/prop/int.h
+       pv/prop/property.h
+       pv/prop/string.h
        pv/toolbars/samplingbar.h
        pv/view/cursor.h
+       pv/view/decodesignal.h
        pv/view/header.h
        pv/view/logicsignal.h
        pv/view/marginwidget.h
@@ -162,6 +178,10 @@ set(pulseview_HEADERS
        pv/view/trace.h
        pv/view/view.h
        pv/view/viewport.h
+       pv/widgets/colourbutton.h
+       pv/widgets/colourpopup.h
+       pv/widgets/popuptoolbutton.h
+       pv/widgets/wellarray.h
 )
 
 set(pulseview_FORMS
@@ -190,10 +210,6 @@ include(${QT_USE_FILE})
 add_definitions(${QT_DEFINITIONS})
 add_definitions(-Wall -Wextra)
 
-if(ENABLE_SIGROKDECODE)
-       add_definitions(-DENABLE_SIGROKDECODE)
-endif()
-
 if(NOT DISABLE_WERROR)
        add_definitions(-Werror)
 endif()