X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=test%2FCMakeLists.txt;h=61b9c4d505b4ebaf1e4a59a34fdd7af7d367a739;hp=446c868b253ae8a7b5eb4816fc5fcb54560a2b19;hb=61703a0124c7ace84caf415f7d491a3ad6f42599;hpb=819e2e95555b2b3c2190f24a3cfa82250d1f34e5

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 446c868..61b9c4d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -23,6 +23,8 @@ set(pulseview_TEST_SOURCES
 	${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/deviceoptions.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/analog.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/analogsegment.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/logic.cpp
@@ -35,8 +37,6 @@ set(pulseview_TEST_SOURCES
 	${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/prop/binding/deviceoptions.cpp
 	${PROJECT_SOURCE_DIR}/pv/popups/channels.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/analogsignal.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/cursor.cpp
@@ -58,6 +58,7 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/view/viewitem.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/viewitempaintparams.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/viewport.cpp
+	${PROJECT_SOURCE_DIR}/pv/view/viewwidget.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/popup.cpp
@@ -73,6 +74,7 @@ set(pulseview_TEST_SOURCES
 set(pulseview_TEST_HEADERS
 	${PROJECT_SOURCE_DIR}/pv/session.hpp
 	${PROJECT_SOURCE_DIR}/pv/storesession.hpp
+	${PROJECT_SOURCE_DIR}/pv/binding/deviceoptions.hpp
 	${PROJECT_SOURCE_DIR}/pv/popups/channels.hpp
 	${PROJECT_SOURCE_DIR}/pv/popups/deviceoptions.hpp
 	${PROJECT_SOURCE_DIR}/pv/prop/bool.hpp
@@ -81,7 +83,6 @@ set(pulseview_TEST_HEADERS
 	${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/prop/binding/deviceoptions.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/cursor.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/flag.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/header.hpp
@@ -97,6 +98,7 @@ set(pulseview_TEST_HEADERS
 	${PROJECT_SOURCE_DIR}/pv/view/view.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/viewitem.hpp
 	${PROJECT_SOURCE_DIR}/pv/view/viewport.hpp
+	${PROJECT_SOURCE_DIR}/pv/view/viewwidget.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.hpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/popup.hpp
@@ -107,12 +109,12 @@ set(pulseview_TEST_HEADERS
 
 if(ENABLE_DECODE)
 	list(APPEND pulseview_TEST_SOURCES
+		${PROJECT_SOURCE_DIR}/pv/binding/decoderoptions.cpp
 		${PROJECT_SOURCE_DIR}/pv/data/decoderstack.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/widgets/decodergroupbox.cpp
 		${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.cpp