X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=15902c805f8836e056da85f6e71cd5c2f6d6017d;hp=80e90e9b48601bcf74cc665a9aaeb30ab263d49e;hb=f32905530347e1020d5ce7959123cf797c9a4829;hpb=0661570b953f656b96762fc5ba81b9ee6b6fd83a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80e90e9b..15902c80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,10 +65,10 @@ endif()
 #= Dependencies
 #-------------------------------------------------------------------------------
 
-list(APPEND PKGDEPS libsigrokcxx>=0.3.0)
+list(APPEND PKGDEPS libsigrokcxx>=0.4.0)
 
 if(ENABLE_DECODE)
-	list(APPEND PKGDEPS libsigrokdecode>=0.3.0)
+	list(APPEND PKGDEPS libsigrokdecode>=0.4.0)
 endif()
 
 if(ANDROID)
@@ -123,10 +123,11 @@ set(PV_TITLE PulseView)
 set(PV_DESCRIPTION "A GUI for sigrok")
 
 set(PV_VERSION_MAJOR 0)
-set(PV_VERSION_MINOR 2)
+set(PV_VERSION_MINOR 3)
 set(PV_VERSION_MICRO 0)
+set(PV_VERSION_SUFFIX -git)
 set(PV_VERSION_STRING
-	${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}
+	${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}${PV_VERSION_SUFFIX}
 )
 
 configure_file (
@@ -155,6 +156,11 @@ set(pulseview_SOURCES
 	pv/data/logicsegment.cpp
 	pv/data/signaldata.cpp
 	pv/data/segment.cpp
+	pv/devices/device.cpp
+	pv/devices/file.cpp
+	pv/devices/hardwaredevice.cpp
+	pv/devices/inputfile.cpp
+	pv/devices/sessionfile.cpp
 	pv/dialogs/about.cpp
 	pv/dialogs/connect.cpp
 	pv/dialogs/inputoutputoptions.cpp
@@ -194,6 +200,7 @@ set(pulseview_SOURCES
 	pv/widgets/devicetoolbutton.cpp
 	pv/widgets/exportmenu.cpp
 	pv/widgets/hidingmenubar.cpp
+	pv/widgets/importmenu.cpp
 	pv/widgets/popup.cpp
 	pv/widgets/popuptoolbutton.cpp
 	pv/widgets/sweeptimingwidget.cpp
@@ -240,6 +247,7 @@ set(pulseview_HEADERS
 	pv/widgets/devicetoolbutton.hpp
 	pv/widgets/exportmenu.hpp
 	pv/widgets/hidingmenubar.hpp
+	pv/widgets/importmenu.hpp
 	pv/widgets/popup.hpp
 	pv/widgets/popuptoolbutton.hpp
 	pv/widgets/sweeptimingwidget.hpp
@@ -424,7 +432,7 @@ set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README)
 set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/COPYING)
 set(CPACK_SOURCE_IGNORE_FILES ${CMAKE_CURRENT_BINARY_DIR} ".gitignore" ".git")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME
-	"${CMAKE_PROJECT_NAME}-${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}")
+	"${CMAKE_PROJECT_NAME}-${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}${PV_VERSION_SUFFIX}")
 set(CPACK_SOURCE_GENERATOR "TGZ")
 
 include(CPack)