X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=78c1f8e462f336cf1f0611fc4d6fe3237a553e50;hp=4644dc8355471cef2136d62eb80865884762e7c4;hb=0dfbf7ff242c8bfbc7fbd0250754e93911f9175d;hpb=28a4c9c5eb20296199fc3496bb40b7733dffac75

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4644dc83..78c1f8e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,20 +1,20 @@
 cmake_minimum_required(VERSION 2.6)
 include(FindPkgConfig)
 
-project(sigrok-qt2)
+project(pulseview)
 
 find_package(PkgConfig)
 pkg_check_modules(PKGDEPS REQUIRED
 	libsigrokdecode>=0.1.0
-	libsigrok>=0.1.0
+	libsigrok>=0.2.0
 )
 
 find_package(Qt4 REQUIRED)
-find_package(Boost 1.46 REQUIRED)
+find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
 
 set(VERSION 0.1.0)
 
-set(sigrok-qt2_SOURCES
+set(pulseview_SOURCES
 	about.cpp
 	datasnapshot.cpp
 	logicdata.cpp
@@ -22,33 +22,45 @@ set(sigrok-qt2_SOURCES
 	logicsignal.cpp
 	main.cpp
 	mainwindow.cpp
+	samplingbar.cpp
 	signaldata.cpp
 	sigsession.cpp
 	signal.cpp
-	sigview.cpp
+	pv/view/header.cpp
+	pv/view/ruler.cpp
+	pv/view/view.cpp
+	pv/view/viewport.cpp
 )
 
-set(sigrok-qt2_HEADERS
+set(pulseview_HEADERS
 	about.h
 	mainwindow.h
+	samplingbar.h
 	sigsession.h
-	sigview.h
+	pv/view/header.h
+	pv/view/ruler.h
+	pv/view/view.h
+	pv/view/viewport.h
 )
 
-set(sigrok-qt2_FORMS
+set(pulseview_FORMS
 	about.ui
-	mainwindow.ui
 )
 
-set(sigrok-qt2_RESOURCES
-	sigrok-qt2.qrc
+set(pulseview_RESOURCES
+	pulseview.qrc
 )
 
-set(QT_USE_QTOPENGL TRUE)
+set(pulseview_TEST_SOURCES
+	test/logicdatasnapshot.cpp
+	test/test.cpp
+	datasnapshot.cpp
+	logicdatasnapshot.cpp
+)
 
-qt4_wrap_cpp(sigrok-qt2_HEADERS_MOC ${sigrok-qt2_HEADERS})
-qt4_wrap_ui(sigrok-qt2_FORMS_HEADERS ${sigrok-qt2_FORMS})
-qt4_add_resources(sigrok-qt2_RESOURCES_RCC ${sigrok-qt2_RESOURCES})
+qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
+qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
+qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
 
 include(${QT_USE_FILE})
 
@@ -66,15 +78,30 @@ link_directories(
 	${PKGDEPS_LIBRARY_DIRS}
 )
 
-add_executable(sigrok-qt2
-	${sigrok-qt2_SOURCES}
-	${sigrok-qt2_HEADERS_MOC}
-	${sigrok-qt2_FORMS_HEADERS}
-	${sigrok-qt2_RESOURCES_RCC}
+add_executable(pulseview
+	${pulseview_SOURCES}
+	${pulseview_HEADERS_MOC}
+	${pulseview_FORMS_HEADERS}
+	${pulseview_RESOURCES_RCC}
+)
+
+target_link_libraries(pulseview
+	${Boost_LIBRARIES}
+	${PKGDEPS_LIBRARIES}
+	${QT_LIBRARIES}
+)
+
+add_definitions(-DBOOST_TEST_DYN_LINK)
+
+add_executable(pulseview-test
+	${pulseview_TEST_SOURCES}
 )
 
-target_link_libraries(sigrok-qt2
+target_link_libraries(pulseview-test
 	${Boost_LIBRARIES}
 	${PKGDEPS_LIBRARIES}
 	${QT_LIBRARIES}
 )
+
+enable_testing()
+add_test(test ${CMAKE_CURRENT_BINARY_DIR}/pulseview-test)