Implemented a global decode lock to prevent concurrent decode

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f633cd5505562c585bfca86c683cdafd1b85a49e..2ea44dba08084bf4d3bcc15f385f3d5ea7c1f873 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,16 +115,17 @@ set(pulseview_SOURCES
        pv/dialogs/about.cpp
        pv/dialogs/connect.cpp
        pv/dialogs/decoder.cpp
        pv/dialogs/about.cpp
        pv/dialogs/connect.cpp
        pv/dialogs/decoder.cpp

-       pv/dialogs/deviceoptions.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/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/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/toolbars/samplingbar.cpp
        pv/view/analogsignal.cpp
        pv/view/cursor.cpp


@@ -138,9 +139,15 @@ set(pulseview_SOURCES
        pv/view/signal.cpp
        pv/view/timemarker.cpp
        pv/view/trace.cpp
        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/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
 )
 
 # This list includes only QObject derrived class headers


@@ -150,8 +157,14 @@ set(pulseview_HEADERS
        pv/data/decoder.h
        pv/dialogs/about.h
        pv/dialogs/connect.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/toolbars/samplingbar.h
        pv/view/cursor.h
        pv/view/decodesignal.h


@@ -165,6 +178,10 @@ set(pulseview_HEADERS
        pv/view/trace.h
        pv/view/view.h
        pv/view/viewport.h
        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
 )
 
 set(pulseview_FORMS