X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=78acee6163836d1d44eb1faa2564450f1152ed87;hp=eb5d0f15de2945b2f07e343eccaac22627589c77;hb=ce6001b8b3b21778218f07549b165ac848ceffd2;hpb=226a15274c4b0f3374bed48c0c4684484762ccf5

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb5d0f15..78acee61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
 option(DISABLE_WERROR "Build without -Werror" FALSE)
 option(ENABLE_SIGNALS "Build with UNIX signals" TRUE)
 option(ENABLE_DECODE "Build with libsigrokdecode" TRUE)
-option(ENABLE_COTIRE "Enable cotire" FALSE)
 option(ENABLE_TESTS "Enable unit tests" FALSE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE)
 option(FORCE_QT4 "Force use of Qt4 even if Qt5 is available" FALSE)
@@ -48,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()
@@ -62,7 +65,7 @@ endif()
 #= Dependencies
 #-------------------------------------------------------------------------------
 
-list(APPEND PKGDEPS libsigrokxx>=0.3.0)
+list(APPEND PKGDEPS libsigrokcxx>=0.3.0)
 
 if(ENABLE_DECODE)
 	list(APPEND PKGDEPS libsigrokdecode>=0.3.0)
@@ -95,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.
@@ -150,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
@@ -172,27 +165,33 @@ set(pulseview_SOURCES
 	pv/prop/string.cpp
 	pv/prop/binding/binding.cpp
 	pv/prop/binding/deviceoptions.cpp
-	pv/toolbars/samplingbar.cpp
+	pv/toolbars/mainbar.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/devicetoolbutton.cpp
+	pv/widgets/exportmenu.cpp
+	pv/widgets/hidingmenubar.cpp
 	pv/widgets/popup.cpp
 	pv/widgets/popuptoolbutton.cpp
 	pv/widgets/sweeptimingwidget.cpp
@@ -202,7 +201,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
@@ -216,23 +215,28 @@ set(pulseview_HEADERS
 	pv/prop/property.hpp
 	pv/prop/string.hpp
 	pv/prop/binding/deviceoptions.hpp
-	pv/toolbars/samplingbar.hpp
+	pv/toolbars/mainbar.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/devicetoolbutton.hpp
+	pv/widgets/exportmenu.hpp
+	pv/widgets/hidingmenubar.hpp
 	pv/widgets/popup.hpp
 	pv/widgets/popuptoolbutton.hpp
 	pv/widgets/sweeptimingwidget.hpp
@@ -393,11 +397,6 @@ if(WIN32)
 	set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows")
 endif()
 
-if(ENABLE_COTIRE)
-	include(cotire)
-	cotire(${PROJECT_NAME})
-endif()
-
 #===============================================================================
 #= Installation
 #-------------------------------------------------------------------------------