X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=test%2FCMakeLists.txt;h=de2ef909cf86fdf7af5d07ebc1acd337a42b2b20;hp=0a58cde8e747d41dbd5f22308449d0ef23336e0d;hb=dfb9f75d24658803a480454cc7e8e4834263fa57;hpb=2ec05cc6cdb6b34f99e9dc82d123d3d0b41d6690

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0a58cde8..de2ef909 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -18,10 +18,13 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-list(APPEND PKGDEPS
-	libsigrok>=0.2.0
-	libsigrokdecode>=0.2.0
-)
+option(ENABLE_DECODE "Build with libsigrokdecode" FALSE)
+
+list(APPEND PKGDEPS libsigrok>=0.2.0)
+
+if(ENABLE_DECODE)
+	list(APPEND PKGDEPS libsigrokdecode>=0.2.0)
+endif()
 
 find_package(PkgConfig)
 pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
@@ -41,15 +44,17 @@ set(pulseview_TEST_SOURCES
 	${PROJECT_SOURCE_DIR}/pv/view/cursorpair.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/analog.cpp
 	${PROJECT_SOURCE_DIR}/pv/data/analogsnapshot.cpp
-	${PROJECT_SOURCE_DIR}/pv/data/decoder.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/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/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/header.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/logicsignal.cpp
 	${PROJECT_SOURCE_DIR}/pv/view/marginwidget.cpp
@@ -61,13 +66,11 @@ set(pulseview_TEST_SOURCES
 	${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/view/decode/annotation.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/popup.cpp
 	${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.cpp
 	data/analogsnapshot.cpp
-	data/decoder.cpp
 	data/logicsnapshot.cpp
 	test.cpp
 )
@@ -75,9 +78,10 @@ set(pulseview_TEST_SOURCES
 # This list includes only QObject derrived class headers
 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/header.h
 	${PROJECT_SOURCE_DIR}/pv/view/logicsignal.h
 	${PROJECT_SOURCE_DIR}/pv/view/marginwidget.h
@@ -90,11 +94,36 @@ 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/popup.h
 	${PROJECT_SOURCE_DIR}/pv/widgets/wellarray.h
 )
 
+if(ENABLE_DECODE)
+	list(APPEND pulseview_TEST_SOURCES
+		${PROJECT_SOURCE_DIR}/pv/data/decoderstack.cpp
+		${PROJECT_SOURCE_DIR}/pv/data/decode/decoder.cpp
+		${PROJECT_SOURCE_DIR}/pv/data/decode/annotation.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
+		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
+	)
+endif()
+
 qt4_wrap_cpp(pulseview_TEST_HEADERS_MOC ${pulseview_TEST_HEADERS})
 
+if(ENABLE_DECODE)
+	add_definitions(-DENABLE_DECODE)
+endif()
+
 add_definitions(-DBOOST_TEST_DYN_LINK)
 add_definitions(${QT_DEFINITIONS})