X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=b70a905ecba381df743972b02e717abcac353ebd;hb=3231fbf9374113d07d3d544a4822ae46032062a2;hp=532e6f3b46b70305c56f19c220b8d6da3827f075;hpb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 532e6f3b..b70a905e 100644
--- 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,11 +262,11 @@ 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
 	pv/widgets/exportmenu.cpp
-	pv/widgets/hidingmenubar.cpp
 	pv/widgets/importmenu.cpp
 	pv/widgets/popup.cpp
 	pv/widgets/popuptoolbutton.cpp
@@ -315,11 +315,11 @@ 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
 	pv/widgets/exportmenu.hpp
-	pv/widgets/hidingmenubar.hpp
 	pv/widgets/importmenu.hpp
 	pv/widgets/popup.hpp
 	pv/widgets/popuptoolbutton.hpp
@@ -398,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)