X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=a3b41205e2d447fc20a7527479b655bb3ad983af;hp=a82953cc166141af626ace0e5d2b3a285bf20eea;hb=9e8f0e503e0c79c3765947ba5abae0ffc76850c4;hpb=812c0e3592e51946947b55c54b906bf4a0cb30e9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a82953cc..a3b41205 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,6 @@
 
 cmake_minimum_required(VERSION 2.8.6)
 
-include(FindPkgConfig)
 include(GNUInstallDirs)
 
 project(pulseview)
@@ -34,7 +33,7 @@ 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_TESTS "Enable unit tests" FALSE)
+option(ENABLE_TESTS "Enable unit tests" TRUE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE)
 option(FORCE_QT4 "Force use of Qt4 even if Qt5 is available" FALSE)
 
@@ -99,9 +98,9 @@ else()
 endif()
 
 if(ENABLE_TESTS)
-	find_package(Boost 1.48 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
+	find_package(Boost 1.53 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
 else()
-	find_package(Boost 1.48 COMPONENTS filesystem system thread REQUIRED)
+	find_package(Boost 1.53 COMPONENTS filesystem system thread REQUIRED)
 endif()
 
 # Find the platform's thread library (needed for C++11 threads).
@@ -121,7 +120,7 @@ memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS)
 
 set(PV_TITLE PulseView)
 set(PV_DESCRIPTION "A GUI for sigrok")
-set(PV_VERSION_STRING "0.3.0")
+set(PV_VERSION_STRING "0.4.0")
 
 include(GetGitRevisionDescription)
 
@@ -206,6 +205,7 @@ set(pulseview_SOURCES
 	pv/view/tracepalette.cpp
 	pv/view/tracetreeitem.cpp
 	pv/view/tracetreeitemowner.cpp
+	pv/view/triggermarker.cpp
 	pv/view/view.cpp
 	pv/view/viewitem.cpp
 	pv/view/viewitemowner.cpp
@@ -244,6 +244,7 @@ set(pulseview_HEADERS
 	pv/prop/property.hpp
 	pv/prop/string.hpp
 	pv/toolbars/mainbar.hpp
+	pv/view/analogsignal.hpp
 	pv/view/cursor.hpp
 	pv/view/flag.hpp
 	pv/view/header.hpp
@@ -258,6 +259,7 @@ set(pulseview_HEADERS
 	pv/view/trace.hpp
 	pv/view/tracegroup.hpp
 	pv/view/tracetreeitem.hpp
+	pv/view/triggermarker.hpp
 	pv/view/view.hpp
 	pv/view/viewitem.hpp
 	pv/view/viewport.hpp
@@ -328,7 +330,7 @@ if(Qt5Core_FOUND)
 	qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
 	qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
 else()
-	# Workaroud for QTBUG-22829: -DBOOST_NEXT_PRIOR_HPP_INCLUDED.
+	# Workaround for QTBUG-22829: -DBOOST_NEXT_PRIOR_HPP_INCLUDED.
 	# https://bugreports.qt.io/browse/QTBUG-22829
 	qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}
 		OPTIONS -DBOOST_NEXT_PRIOR_HPP_INCLUDED)