cmake_minimum_required(VERSION 2.8.6)
-include(FindPkgConfig)
include(GNUInstallDirs)
project(pulseview)
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)
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).
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)
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
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
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
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)