Use SignalBase instead of LogicSignal for decoders

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44f810e3c5fec71a299a166ee546a705ceb22ef8..532e6f3b46b70305c56f19c220b8d6da3827f075 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
@@ -280,6 +281,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
@@ -440,13 +442,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)