X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=e0edfbc3d86132fc66d2beafce24b8914e589e87;hp=fd932a2926de718d2b06bc3a4220e942fb3719ec;hb=4780b4c82daf8e6d0386411d333967782bf52d8c;hpb=df9443999c6b365c37cd254320d7dfa1aa4a815b;ds=sidebyside

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd932a29..e0edfbc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,31 +10,47 @@ pkg_check_modules(PKGDEPS REQUIRED
 )
 
 find_package(Qt4 REQUIRED)
+find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
 
 set(VERSION 0.1.0)
 
 set(sigrok-qt2_SOURCES
 	about.cpp
+	datasnapshot.cpp
+	logicdata.cpp
+	logicdatasnapshot.cpp
+	logicsignal.cpp
 	main.cpp
 	mainwindow.cpp
+	samplingbar.cpp
+	signaldata.cpp
+	sigsession.cpp
+	signal.cpp
 	sigview.cpp
 )
 
 set(sigrok-qt2_HEADERS
 	about.h
 	mainwindow.h
+	samplingbar.h
+	sigsession.h
 	sigview.h
 )
 
 set(sigrok-qt2_FORMS
 	about.ui
-	mainwindow.ui
 )
 
 set(sigrok-qt2_RESOURCES
 	sigrok-qt2.qrc
 )
 
+set(sigrok-qt2_TEST_SOURCES
+	test/test.cpp
+	datasnapshot.cpp
+	logicdatasnapshot.cpp
+)
+
 set(QT_USE_QTOPENGL TRUE)
 
 qt4_wrap_cpp(sigrok-qt2_HEADERS_MOC ${sigrok-qt2_HEADERS})
@@ -48,10 +64,12 @@ add_definitions(-DAPP_VERSION="${VERSION}")
 
 include_directories(
 	${include_directories}
+	${Boost_INCLUDE_DIRS}
 	${PKGDEPS_INCLUDE_DIRS}
 )
 
 link_directories(
+	${Boost_LIBRARY_DIRS}
 	${PKGDEPS_LIBRARY_DIRS}
 )
 
@@ -63,6 +81,22 @@ add_executable(sigrok-qt2
 )
 
 target_link_libraries(sigrok-qt2
+	${Boost_LIBRARIES}
+	${PKGDEPS_LIBRARIES}
+	${QT_LIBRARIES}
+)
+
+add_definitions(-DBOOST_TEST_DYN_LINK)
+
+add_executable(sigrok-qt2-test
+	${sigrok-qt2_TEST_SOURCES}
+)
+
+target_link_libraries(sigrok-qt2-test
+	${Boost_LIBRARIES}
 	${PKGDEPS_LIBRARIES}
 	${QT_LIBRARIES}
 )
+
+enable_testing()
+add_test(test ${CMAKE_CURRENT_BINARY_DIR}/sigrok-qt2-test)