X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=69e62ee5e4dd3bed6757c1e20a1a3756ab66c377;hp=44f810e3c5fec71a299a166ee546a705ceb22ef8;hb=53e8927dc930f88950027b159878f8d4ada7251e;hpb=4da54b6be6a1ca19a2026908d48ae5c8d327ec86

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44f810e3..69e62ee5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,9 +98,9 @@ else()
 endif()
 
 if(ENABLE_TESTS)
-	find_package(Boost 1.53 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
+	find_package(Boost 1.53 COMPONENTS filesystem serialization system thread unit_test_framework REQUIRED)
 else()
-	find_package(Boost 1.53 COMPONENTS filesystem system thread REQUIRED)
+	find_package(Boost 1.53 COMPONENTS filesystem serialization system thread REQUIRED)
 endif()
 
 # Find the platform's thread library (needed for C++11 threads).
@@ -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
@@ -440,13 +440,15 @@ set(PULSEVIEW_LINK_LIBS
 )
 
 if(STATIC_PKGDEPS_LIBS)
-	list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LDFLAGS})
+	link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS})
+	list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES})
 if(WIN32)
 	# Workaround for a MinGW linking issue.
 	list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2")
 endif()
 else()
-	list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LDFLAGS})
+	link_directories(${PKGDEPS_LIBRARY_DIRS})
+	list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES})
 endif()
 
 if(WIN32)