X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=50dde49032ca2ff898757f847abc465f3bc575cf;hp=d959a9f343cf8090c2291d1d1b95603e828c9ceb;hb=744905d4ec6a05b53c17efb393a0ef907d95ebe2;hpb=9df8453f6809f2ce038717111979474a60d5746a;ds=sidebyside

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d959a9f3..50dde490 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)
@@ -80,9 +80,9 @@ find_package(Threads)
 if(WIN32)
 	# On Windows/MinGW we need to use 'thread_win32' instead of 'thread'.
 	# The library is named libboost_thread_win32* (not libboost_thread*).
-	find_package(Boost 1.42 COMPONENTS system thread_win32 REQUIRED)
+	find_package(Boost 1.42 COMPONENTS filesystem system thread_win32 REQUIRED)
 else()
-	find_package(Boost 1.42 COMPONENTS system thread REQUIRED)
+	find_package(Boost 1.42 COMPONENTS filesystem system thread REQUIRED)
 endif()
 
 #===============================================================================
@@ -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}
@@ -118,7 +118,6 @@ configure_file (
 set(pulseview_SOURCES
 	main.cpp
 	pv/devicemanager.cpp
-	pv/devinst.cpp
 	pv/mainwindow.cpp
 	pv/sigsession.cpp
 	pv/storesession.cpp
@@ -128,6 +127,11 @@ set(pulseview_SOURCES
 	pv/data/logicsnapshot.cpp
 	pv/data/signaldata.cpp
 	pv/data/snapshot.cpp
+	pv/device/device.cpp
+	pv/device/file.cpp
+	pv/device/devinst.cpp
+	pv/device/inputfile.cpp
+	pv/device/sessionfile.cpp
 	pv/dialogs/about.cpp
 	pv/dialogs/connect.cpp
 	pv/dialogs/storeprogress.cpp
@@ -166,10 +170,10 @@ set(pulseview_SOURCES
 
 # This list includes only QObject derived class headers.
 set(pulseview_HEADERS
-	pv/devinst.h
 	pv/mainwindow.h
 	pv/sigsession.h
 	pv/storesession.h
+	pv/device/devinst.h
 	pv/dialogs/about.h
 	pv/dialogs/connect.h
 	pv/dialogs/storeprogress.h