X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=15a60d1e8722a617f28f78f35f69dcbea008a863;hp=a5a910456e8b5c053b92bd10da576dd78fde247e;hb=ac223c1e07cb56b69c8a11b94014a0ad3ccf393f;hpb=7ba41e7ec7e575ae34ed2af33920c6e843aaac4d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5a91045..15a60d1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-##
+
 ## This file is part of the PulseView project.
 ##
 ## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
@@ -34,7 +34,7 @@ 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_DECODE "Build with libsigrokdecode" FALSE)
 option(ENABLE_TESTS "Enable unit tests" FALSE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE)
 
@@ -59,7 +59,7 @@ list(APPEND PKGDEPS
 	libsigrok>=0.2.0
 )
 
-if(ENABLE_SIGROKDECODE)
+if(ENABLE_DECODE)
 	list(APPEND PKGDEPS libsigrokdecode>=0.2.0)
 endif()
 
@@ -117,15 +117,16 @@ set(pulseview_SOURCES
 	pv/data/snapshot.cpp
 	pv/dialogs/about.cpp
 	pv/dialogs/connect.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/string.cpp
 	pv/prop/binding/binding.cpp
 	pv/prop/binding/deviceoptions.cpp
-	pv/toolbars/contextbar.cpp
 	pv/toolbars/samplingbar.cpp
 	pv/view/analogsignal.cpp
 	pv/view/cursor.cpp
@@ -138,8 +139,14 @@ 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/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
@@ -148,8 +155,14 @@ set(pulseview_HEADERS
 	pv/sigsession.h
 	pv/dialogs/about.h
 	pv/dialogs/connect.h
-	pv/dialogs/deviceoptions.h
-	pv/toolbars/contextbar.h
+	pv/popups/probes.h
+	pv/popups/deviceoptions.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/header.h
@@ -162,6 +175,11 @@ 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/popup.h
+	pv/widgets/popuptoolbutton.h
+	pv/widgets/wellarray.h
 )
 
 set(pulseview_FORMS
@@ -177,6 +195,26 @@ if(ENABLE_SIGNALS)
 	list(APPEND pulseview_HEADERS signalhandler.h)
 endif()
 
+if(ENABLE_DECODE)
+	list(APPEND pulseview_SOURCES
+		pv/data/decoderstack.cpp
+		pv/data/decode/annotation.cpp
+		pv/data/decode/decoder.cpp
+		pv/prop/binding/decoderoptions.cpp
+		pv/view/decodetrace.cpp
+		pv/widgets/decodergroupbox.cpp
+		pv/widgets/decodermenu.cpp
+		pv/widgets/wellarray.cpp
+	)
+
+	list(APPEND pulseview_HEADERS
+		pv/data/decoderstack.h
+		pv/view/decodetrace.h
+		pv/widgets/decodergroupbox.h
+		pv/widgets/decodermenu.h
+	)
+endif()
+
 qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
 qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
 qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
@@ -188,10 +226,11 @@ include(${QT_USE_FILE})
 #-------------------------------------------------------------------------------
 
 add_definitions(${QT_DEFINITIONS})
+add_definitions(-D__STDC_LIMIT_MACROS)
 add_definitions(-Wall -Wextra)
 
-if(ENABLE_SIGROKDECODE)
-	add_definitions(-DENABLE_SIGROKDECODE)
+if(ENABLE_DECODE)
+	add_definitions(-DENABLE_DECODE)
 endif()
 
 if(NOT DISABLE_WERROR)