Change namespace for the trace view and implement ViewBase

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b28850258cdb88d56a1eab520a0d6500a7bdeb1..b70a905ecba381df743972b02e717abcac353ebd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,11 +97,11 @@ else()
        find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
 endif()
 
+set(BOOSTCOMPS filesystem serialization system thread)
 if(ENABLE_TESTS)
-       find_package(Boost 1.53 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
-else()
-       find_package(Boost 1.53 COMPONENTS filesystem system thread REQUIRED)
+       list(APPEND BOOSTCOMPS unit_test_framework)
 endif()
+find_package(Boost 1.55 COMPONENTS ${BOOSTCOMPS} REQUIRED)
 
 # Find the platform's thread library (needed for C++11 threads).
 # This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
@@ -262,6 +262,7 @@ set(pulseview_SOURCES
        pv/view/viewitempaintparams.cpp
        pv/view/viewport.cpp
        pv/view/viewwidget.cpp
+       pv/views/viewbase.cpp
        pv/widgets/colourbutton.cpp
        pv/widgets/colourpopup.cpp
        pv/widgets/devicetoolbutton.cpp
@@ -314,6 +315,7 @@ set(pulseview_HEADERS
        pv/view/viewitem.hpp
        pv/view/viewport.hpp
        pv/view/viewwidget.hpp
+       pv/views/viewbase.hpp
        pv/widgets/colourbutton.hpp
        pv/widgets/colourpopup.hpp
        pv/widgets/devicetoolbutton.hpp
@@ -396,6 +398,7 @@ add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS)
 add_definitions(-D__STDC_LIMIT_MACROS)
 add_definitions(-Wall -Wextra)
 add_definitions(-std=c++11)
+add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1)
 
 if(ENABLE_DECODE)
        add_definitions(-DENABLE_DECODE)