cmake, INSTALL: Bump the Boost requirement to >= 1.55.

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49c35cae15f6ab318f6d161b61c22d98e31be107..d84f0427d6eabb7d6f183fb85272a623e103405f 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.
@@ -216,6 +216,7 @@ set(pulseview_SOURCES
        pv/data/analogsegment.cpp
        pv/data/logic.cpp
        pv/data/logicsegment.cpp
+       pv/data/signalbase.cpp
        pv/data/signaldata.cpp
        pv/data/segment.cpp
        pv/devices/device.cpp
@@ -265,7 +266,6 @@ set(pulseview_SOURCES
        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
@@ -280,6 +280,7 @@ set(pulseview_HEADERS
        pv/session.hpp
        pv/storesession.hpp
        pv/binding/device.hpp
+       pv/data/signalbase.hpp
        pv/dialogs/about.hpp
        pv/dialogs/connect.hpp
        pv/dialogs/inputoutputoptions.hpp
@@ -317,7 +318,6 @@ set(pulseview_HEADERS
        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