X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=31926adf5d5703ff4c476f635d0278389a5a2af1;hp=27859b3ad0674bcf48dbe16203229391dad0b82e;hb=8f717aa7b150769d75562a2328cab5b556f7b585;hpb=2b76309a072d2493ee1b5293955b72abfd84b8be diff --git a/CMakeLists.txt b/CMakeLists.txt index 27859b3a..31926adf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ endif() #= Dependencies #------------------------------------------------------------------------------- -list(APPEND PKGDEPS libsigrok>=0.3.0) +list(APPEND PKGDEPS libsigrokxx>=0.3.0) if(ENABLE_DECODE) list(APPEND PKGDEPS libsigrokdecode>=0.3.0) @@ -92,6 +92,8 @@ endif() find_package(Boost 1.42 COMPONENTS filesystem system 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. find_package(Threads REQUIRED) #=============================================================================== @@ -138,10 +140,6 @@ set(pulseview_SOURCES pv/data/logicsnapshot.cpp pv/data/signaldata.cpp pv/data/snapshot.cpp - pv/device/device.cpp - pv/device/file.cpp - pv/device/devinst.cpp - pv/device/sessionfile.cpp pv/dialogs/about.cpp pv/dialogs/connect.cpp pv/dialogs/storeprogress.cpp @@ -184,7 +182,6 @@ set(pulseview_HEADERS pv/mainwindow.h pv/sigsession.h pv/storesession.h - pv/device/devinst.h pv/dialogs/about.h pv/dialogs/connect.h pv/dialogs/storeprogress.h @@ -196,6 +193,7 @@ set(pulseview_HEADERS pv/prop/int.h pv/prop/property.h pv/prop/string.h + pv/prop/binding/deviceoptions.h pv/toolbars/samplingbar.h pv/view/cursor.h pv/view/cursorheader.h