X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=test%2FCMakeLists.txt;h=afe26a16fd8a24f772663480302258f7d0cc196b;hb=f0d37dab05f9fb055a9af8a05d776d1a5b4b0909;hp=a8f152c165cf710bf64825bb4bed87f1793f75b6;hpb=3b3a445c072df27ae4e1831f6078467d84baa425;p=pulseview.git

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a8f152c1..afe26a16 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -30,9 +30,9 @@ pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
 # This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
 find_package(Threads)
 
-find_package(Boost 1.46 COMPONENTS system unit_test_framework REQUIRED)
+find_package(Boost 1.42 COMPONENTS system thread unit_test_framework REQUIRED)
 
-#FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
 find_package(Qt4 REQUIRED)
 
 set(pulseview_TEST_SOURCES
@@ -46,10 +46,15 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/data/logicsnapshot.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/snapshot.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/signaldata.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/prop/binding/decoderoptions.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/decodesignal.cpp
+	${PROJECT_SOURCE_DIR}/pv/view/decodetrace.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/header.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/logicsignal.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/marginwidget.cpp
@@ -64,6 +69,7 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/view/decode/annotation.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.cpp
+	${PROJECT_SOURCE_DIR}/pv/widgets/decodermenu.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/popup.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.cpp
 	data/analogsnapshot.cpp
@@ -76,8 +82,11 @@ set(pulseview_TEST_SOURCES
 set(pulseview_TEST_HEADERS
 	${PROJECT_SOURCE_DIR}/pv/sigsession.h
 	${PROJECT_SOURCE_DIR}/pv/data/decoder.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/decodesignal.h
+	${PROJECT_SOURCE_DIR}/pv/view/decodetrace.h
 	${PROJECT_SOURCE_DIR}/pv/view/header.h
 	${PROJECT_SOURCE_DIR}/pv/view/logicsignal.h
 	${PROJECT_SOURCE_DIR}/pv/view/marginwidget.h
@@ -90,6 +99,7 @@ set(pulseview_TEST_HEADERS
 	${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/decodermenu.h
 	${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.h
 )