X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=test%2FCMakeLists.txt;h=a237ad1222a8105e0f6192c735a58990347fc406;hp=0ea69f06624d296999106fc0ff4ef16773e2b505;hb=97378470ded88af84edaa0f1063d10d834475665;hpb=ab186d22b223c95810bdd603db55568a14ba5de8

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0ea69f0..a237ad1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -18,153 +18,179 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-option(ENABLE_DECODE "Build with libsigrokdecode" FALSE)
-
-list(APPEND PKGDEPS libsigrok>=0.3.0)
-
-if(ENABLE_DECODE)
-	list(APPEND PKGDEPS libsigrokdecode>=0.3.0)
-endif()
-
-find_package(PkgConfig)
-pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
-
-# Find the platform's thread library (needed for boost-thread).
-# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
-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 filesystem system thread_win32 unit_test_framework REQUIRED)
-else()
-	find_package(Boost 1.42 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
-endif()
-
-
-find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
-find_package(Qt4 REQUIRED)
-
 set(pulseview_TEST_SOURCES
+	${PROJECT_SOURCE_DIR}/pv/application.cpp
 	${PROJECT_SOURCE_DIR}/pv/devicemanager.cpp
-	${PROJECT_SOURCE_DIR}/pv/sigsession.cpp
-	${PROJECT_SOURCE_DIR}/pv/view/cursorpair.cpp
+	${PROJECT_SOURCE_DIR}/pv/globalsettings.cpp
+	${PROJECT_SOURCE_DIR}/pv/logging.cpp
+	${PROJECT_SOURCE_DIR}/pv/mainwindow.cpp
+	${PROJECT_SOURCE_DIR}/pv/session.cpp
+	${PROJECT_SOURCE_DIR}/pv/storesession.cpp
+	${PROJECT_SOURCE_DIR}/pv/util.cpp
+	${PROJECT_SOURCE_DIR}/pv/binding/binding.cpp
+	${PROJECT_SOURCE_DIR}/pv/binding/device.cpp
+	${PROJECT_SOURCE_DIR}/pv/binding/inputoutput.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/analog.cpp
-	${PROJECT_SOURCE_DIR}/pv/data/analogsnapshot.cpp
+	${PROJECT_SOURCE_DIR}/pv/data/analogsegment.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/logic.cpp
-	${PROJECT_SOURCE_DIR}/pv/data/logicsnapshot.cpp
-	${PROJECT_SOURCE_DIR}/pv/data/snapshot.cpp
+	${PROJECT_SOURCE_DIR}/pv/data/logicsegment.cpp
+	${PROJECT_SOURCE_DIR}/pv/data/segment.cpp
+	${PROJECT_SOURCE_DIR}/pv/data/signalbase.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/signaldata.cpp
-	${PROJECT_SOURCE_DIR}/pv/device/device.cpp
-	${PROJECT_SOURCE_DIR}/pv/device/devinst.cpp
-	${PROJECT_SOURCE_DIR}/pv/device/file.cpp
-	${PROJECT_SOURCE_DIR}/pv/device/inputfile.cpp
-	${PROJECT_SOURCE_DIR}/pv/device/sessionfile.cpp
+	${PROJECT_SOURCE_DIR}/pv/devices/device.cpp
+	${PROJECT_SOURCE_DIR}/pv/devices/file.cpp
+	${PROJECT_SOURCE_DIR}/pv/devices/hardwaredevice.cpp
+	${PROJECT_SOURCE_DIR}/pv/devices/inputfile.cpp
+	${PROJECT_SOURCE_DIR}/pv/devices/sessionfile.cpp
+	${PROJECT_SOURCE_DIR}/pv/dialogs/connect.cpp
+	${PROJECT_SOURCE_DIR}/pv/dialogs/inputoutputoptions.cpp
+	${PROJECT_SOURCE_DIR}/pv/dialogs/settings.cpp
+	${PROJECT_SOURCE_DIR}/pv/dialogs/storeprogress.cpp
+	${PROJECT_SOURCE_DIR}/pv/prop/bool.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/double.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/enum.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/int.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/property.cpp
 	${PROJECT_SOURCE_DIR}/pv/prop/string.cpp
-	${PROJECT_SOURCE_DIR}/pv/prop/binding/binding.cpp
-	${PROJECT_SOURCE_DIR}/pv/view/analogsignal.cpp
-	${PROJECT_SOURCE_DIR}/pv/view/cursor.cpp
-	${PROJECT_SOURCE_DIR}/pv/view/cursorpair.cpp
-	${PROJECT_SOURCE_DIR}/pv/view/header.cpp
-	${PROJECT_SOURCE_DIR}/pv/view/logicsignal.cpp
-	${PROJECT_SOURCE_DIR}/pv/view/marginwidget.cpp
-	${PROJECT_SOURCE_DIR}/pv/view/ruler.cpp
-	${PROJECT_SOURCE_DIR}/pv/view/selectableitem.cpp
-	${PROJECT_SOURCE_DIR}/pv/view/signal.cpp
-	${PROJECT_SOURCE_DIR}/pv/view/timemarker.cpp
-	${PROJECT_SOURCE_DIR}/pv/view/trace.cpp
-	${PROJECT_SOURCE_DIR}/pv/view/tracepalette.cpp
-	${PROJECT_SOURCE_DIR}/pv/view/view.cpp
-	${PROJECT_SOURCE_DIR}/pv/view/viewport.cpp
-	${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.cpp
-	${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.cpp
+	${PROJECT_SOURCE_DIR}/pv/popups/channels.cpp
+	${PROJECT_SOURCE_DIR}/pv/popups/deviceoptions.cpp
+	${PROJECT_SOURCE_DIR}/pv/subwindows/subwindowbase.cpp
+	${PROJECT_SOURCE_DIR}/pv/toolbars/mainbar.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/analogsignal.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/cursor.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/cursorpair.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/flag.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/header.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/marginwidget.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/logicsignal.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/rowitem.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/ruler.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/signal.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/timeitem.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/timemarker.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/trace.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/tracegroup.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/tracepalette.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/tracetreeitem.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/tracetreeitemowner.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/triggermarker.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/view.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/viewitem.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/viewitemowner.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/viewitempaintparams.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/viewport.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/viewwidget.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/viewbase.cpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/standardbar.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/colorbutton.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/colorpopup.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/devicetoolbutton.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/exportmenu.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/importmenu.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/popup.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/popuptoolbutton.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/sweeptimingwidget.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/timestampspinbox.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.cpp
-	data/analogsnapshot.cpp
-	data/logicsnapshot.cpp
+	data/analogsegment.cpp
+	data/logicsegment.cpp
+	data/segment.cpp
+	view/ruler.cpp
 	test.cpp
+	util.cpp
 )
 
 # This list includes only QObject derived class headers.
 set(pulseview_TEST_HEADERS
-	${PROJECT_SOURCE_DIR}/pv/sigsession.h
-	${PROJECT_SOURCE_DIR}/pv/device/devinst.h
-	${PROJECT_SOURCE_DIR}/pv/prop/double.h
-	${PROJECT_SOURCE_DIR}/pv/prop/enum.h
-	${PROJECT_SOURCE_DIR}/pv/prop/int.h
-	${PROJECT_SOURCE_DIR}/pv/prop/property.h
-	${PROJECT_SOURCE_DIR}/pv/prop/string.h
-	${PROJECT_SOURCE_DIR}/pv/view/cursor.h
-	${PROJECT_SOURCE_DIR}/pv/view/header.h
-	${PROJECT_SOURCE_DIR}/pv/view/logicsignal.h
-	${PROJECT_SOURCE_DIR}/pv/view/marginwidget.h
-	${PROJECT_SOURCE_DIR}/pv/view/ruler.h
-	${PROJECT_SOURCE_DIR}/pv/view/selectableitem.h
-	${PROJECT_SOURCE_DIR}/pv/view/signal.h
-	${PROJECT_SOURCE_DIR}/pv/view/timemarker.h
-	${PROJECT_SOURCE_DIR}/pv/view/trace.h
-	${PROJECT_SOURCE_DIR}/pv/view/view.h
-	${PROJECT_SOURCE_DIR}/pv/view/viewport.h
-	${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.h
-	${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.h
-	${PROJECT_SOURCE_DIR}/pv/widgets/popup.h
-	${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.h
+	${PROJECT_SOURCE_DIR}/pv/application.hpp
+	${PROJECT_SOURCE_DIR}/pv/devicemanager.hpp
+	${PROJECT_SOURCE_DIR}/pv/globalsettings.hpp
+	${PROJECT_SOURCE_DIR}/pv/logging.hpp
+	${PROJECT_SOURCE_DIR}/pv/mainwindow.hpp
+	${PROJECT_SOURCE_DIR}/pv/session.hpp
+	${PROJECT_SOURCE_DIR}/pv/storesession.hpp
+	${PROJECT_SOURCE_DIR}/pv/binding/device.hpp
+	${PROJECT_SOURCE_DIR}/pv/data/analog.hpp
+	${PROJECT_SOURCE_DIR}/pv/data/analogsegment.hpp
+	${PROJECT_SOURCE_DIR}/pv/data/logic.hpp
+	${PROJECT_SOURCE_DIR}/pv/data/logicsegment.hpp
+	${PROJECT_SOURCE_DIR}/pv/data/signalbase.hpp
+	${PROJECT_SOURCE_DIR}/pv/devices/device.hpp
+	${PROJECT_SOURCE_DIR}/pv/dialogs/connect.hpp
+	${PROJECT_SOURCE_DIR}/pv/dialogs/inputoutputoptions.hpp
+	${PROJECT_SOURCE_DIR}/pv/dialogs/settings.hpp
+	${PROJECT_SOURCE_DIR}/pv/dialogs/storeprogress.hpp
+	${PROJECT_SOURCE_DIR}/pv/popups/channels.hpp
+	${PROJECT_SOURCE_DIR}/pv/popups/deviceoptions.hpp
+	${PROJECT_SOURCE_DIR}/pv/prop/bool.hpp
+	${PROJECT_SOURCE_DIR}/pv/prop/double.hpp
+	${PROJECT_SOURCE_DIR}/pv/prop/enum.hpp
+	${PROJECT_SOURCE_DIR}/pv/prop/int.hpp
+	${PROJECT_SOURCE_DIR}/pv/prop/property.hpp
+	${PROJECT_SOURCE_DIR}/pv/prop/string.hpp
+	${PROJECT_SOURCE_DIR}/pv/subwindows/subwindowbase.cpp
+	${PROJECT_SOURCE_DIR}/pv/toolbars/mainbar.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/analogsignal.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/cursor.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/flag.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/header.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/logicsignal.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/marginwidget.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/rowitem.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/ruler.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/signal.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/timeitem.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/timemarker.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/trace.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/tracegroup.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/tracetreeitem.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/triggermarker.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/view.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/viewitem.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/viewport.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/viewwidget.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/viewbase.hpp
+	${PROJECT_SOURCE_DIR}/pv/views/trace/standardbar.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/colorbutton.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/colorpopup.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/devicetoolbutton.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/exportmenu.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/importmenu.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/popup.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/popuptoolbutton.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/sweeptimingwidget.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/timestampspinbox.hpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.hpp
 )
 
 if(ENABLE_DECODE)
 	list(APPEND pulseview_TEST_SOURCES
-		${PROJECT_SOURCE_DIR}/pv/data/decoderstack.cpp
+		${PROJECT_SOURCE_DIR}/pv/binding/decoder.cpp
+		${PROJECT_SOURCE_DIR}/pv/data/decodesignal.cpp
 		${PROJECT_SOURCE_DIR}/pv/data/decode/annotation.cpp
 		${PROJECT_SOURCE_DIR}/pv/data/decode/decoder.cpp
 		${PROJECT_SOURCE_DIR}/pv/data/decode/row.cpp
 		${PROJECT_SOURCE_DIR}/pv/data/decode/rowdata.cpp
-		${PROJECT_SOURCE_DIR}/pv/prop/binding/decoderoptions.cpp
-		${PROJECT_SOURCE_DIR}/pv/view/decodetrace.cpp
+		${PROJECT_SOURCE_DIR}/pv/subwindows/decoder_selector/item.cpp
+		${PROJECT_SOURCE_DIR}/pv/subwindows/decoder_selector/model.cpp
+		${PROJECT_SOURCE_DIR}/pv/subwindows/decoder_selector/subwindow.cpp
+		${PROJECT_SOURCE_DIR}/pv/views/trace/decodetrace.cpp
 		${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.cpp
 		${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.cpp
-		data/decoderstack.cpp
 	)
 
 	list(APPEND pulseview_TEST_HEADERS
-		${PROJECT_SOURCE_DIR}/pv/data/decoderstack.h
-		${PROJECT_SOURCE_DIR}/pv/view/decodetrace.h
-		${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.h
-		${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.h
+		${PROJECT_SOURCE_DIR}/pv/data/decodesignal.hpp
+		${PROJECT_SOURCE_DIR}/pv/subwindows/decoder_selector/subwindow.hpp
+		${PROJECT_SOURCE_DIR}/pv/views/trace/decodetrace.hpp
+		${PROJECT_SOURCE_DIR}/pv/widgets/decodergroupbox.hpp
+		${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.hpp
 	)
 endif()
 
-qt4_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS})
-
-if(ENABLE_DECODE)
-	add_definitions(-DENABLE_DECODE)
-endif()
-
 # On MinGW we need to use static linking.
 if(NOT WIN32)
-add_definitions(-DBOOST_TEST_DYN_LINK)
-endif()
-
-add_definitions(${QT_DEFINITIONS})
-
-include_directories(
-	${Boost_INCLUDE_DIRS}
-	${PKGDEPS_INCLUDE_DIRS}
-)
-
-set(PULSEVIEW_LINK_LIBS
-	${Boost_LIBRARIES}
-	${CMAKE_THREAD_LIBS_INIT}
-	${PKGDEPS_LIBRARIES}
-	${QT_LIBRARIES}
-)
-
-if(WIN32)
-	# Workaround for a MinGW linking issue.
-	list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2")
+	add_definitions(-DBOOST_TEST_DYN_LINK)
 endif()
 
 add_executable(pulseview-test