X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=edb8a82c9e16fe7338cd9bcbbc123886f91efb0c;hp=f1e71061059e0eee2344fa51020d26b614ac20d2;hb=208c6fc371951fe74ba5a08a0950f2837eef8b7b;hpb=649f62311e282c44e70cbf0f0d8d83cf1895e623

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1e71061..edb8a82c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,10 @@ if(WIN32)
 	set(Boost_USE_STATIC_LIBS ON)
 	add_definitions(-DBOOST_THREAD_USE_LIB)
 
+	# On Windows/MinGW we need to use 'thread_win32' instead of 'thread'.
+	# The library is named libboost_thread_win32* (not libboost_thread*).
+	set(Boost_THREADAPI win32)
+
 	# Windows does not support UNIX signals.
 	set(ENABLE_SIGNALS FALSE)
 endif()
@@ -94,21 +98,11 @@ else()
 	find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
 endif()
 
-if(WIN32)
-if(ENABLE_TESTS)
-	# On Windows/MinGW we need to use 'thread_win32' instead of 'thread'.
-	# The library is named libboost_thread_win32* (not libboost_thread*).
-	find_package(Boost 1.42 COMPONENTS filesystem system thread_win32 unit_test_framework REQUIRED)
-else()
-	find_package(Boost 1.42 COMPONENTS filesystem system thread_win32 REQUIRED)
-endif()
-else()
 if(ENABLE_TESTS)
 	find_package(Boost 1.42 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
 else()
 	find_package(Boost 1.42 COMPONENTS filesystem system thread REQUIRED)
 endif()
-endif()
 
 # Find the platform's thread library (needed for C++11 threads).
 # This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
@@ -149,15 +143,15 @@ set(pulseview_SOURCES
 	pv/application.cpp
 	pv/devicemanager.cpp
 	pv/mainwindow.cpp
-	pv/sigsession.cpp
+	pv/session.cpp
 	pv/storesession.cpp
 	pv/util.cpp
 	pv/data/analog.cpp
-	pv/data/analogsnapshot.cpp
+	pv/data/analogsegment.cpp
 	pv/data/logic.cpp
-	pv/data/logicsnapshot.cpp
+	pv/data/logicsegment.cpp
 	pv/data/signaldata.cpp
-	pv/data/snapshot.cpp
+	pv/data/segment.cpp
 	pv/dialogs/about.cpp
 	pv/dialogs/connect.cpp
 	pv/dialogs/storeprogress.cpp
@@ -174,22 +168,25 @@ set(pulseview_SOURCES
 	pv/toolbars/samplingbar.cpp
 	pv/view/analogsignal.cpp
 	pv/view/cursor.cpp
-	pv/view/cursorheader.cpp
 	pv/view/cursorpair.cpp
+	pv/view/flag.cpp
 	pv/view/header.cpp
 	pv/view/marginwidget.cpp
 	pv/view/logicsignal.cpp
 	pv/view/rowitem.cpp
 	pv/view/rowitemowner.cpp
 	pv/view/ruler.cpp
-	pv/view/selectableitem.cpp
 	pv/view/signal.cpp
+	pv/view/timeitem.cpp
 	pv/view/timemarker.cpp
 	pv/view/trace.cpp
 	pv/view/tracegroup.cpp
 	pv/view/tracepalette.cpp
 	pv/view/view.cpp
+	pv/view/viewitem.cpp
+	pv/view/viewitempaintparams.cpp
 	pv/view/viewport.cpp
+	pv/view/viewwidget.cpp
 	pv/widgets/colourbutton.cpp
 	pv/widgets/colourpopup.cpp
 	pv/widgets/popup.cpp
@@ -201,7 +198,7 @@ set(pulseview_SOURCES
 # This list includes only QObject derived class headers.
 set(pulseview_HEADERS
 	pv/mainwindow.hpp
-	pv/sigsession.hpp
+	pv/session.hpp
 	pv/storesession.hpp
 	pv/dialogs/about.hpp
 	pv/dialogs/connect.hpp
@@ -217,19 +214,21 @@ set(pulseview_HEADERS
 	pv/prop/binding/deviceoptions.hpp
 	pv/toolbars/samplingbar.hpp
 	pv/view/cursor.hpp
-	pv/view/cursorheader.hpp
+	pv/view/flag.hpp
 	pv/view/header.hpp
 	pv/view/logicsignal.hpp
 	pv/view/marginwidget.hpp
 	pv/view/rowitem.hpp
 	pv/view/ruler.hpp
-	pv/view/selectableitem.hpp
 	pv/view/signal.hpp
+	pv/view/timeitem.hpp
 	pv/view/timemarker.hpp
 	pv/view/trace.hpp
 	pv/view/tracegroup.hpp
 	pv/view/view.hpp
+	pv/view/viewitem.hpp
 	pv/view/viewport.hpp
+	pv/view/viewwidget.hpp
 	pv/widgets/colourbutton.hpp
 	pv/widgets/colourpopup.hpp
 	pv/widgets/popup.hpp