test/CMakeLists.txt: Update file list.

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d85948c095afbd7713709f0705c5f334a8dddb66..31926adf5d5703ff4c476f635d0278389a5a2af1 100644 (file)
--- 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,10 @@ 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)
+
 #===============================================================================
 #= System Introspection
 #-------------------------------------------------------------------------------
@@ -124,6 +128,7 @@ configure_file (
 
 set(pulseview_SOURCES
        main.cpp
+       pv/application.cpp
        pv/devicemanager.cpp
        pv/mainwindow.cpp
        pv/sigsession.cpp
@@ -135,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
@@ -181,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
@@ -193,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
@@ -317,6 +318,7 @@ link_directories(${Boost_LIBRARY_DIRS})
 set(PULSEVIEW_LINK_LIBS
        ${Boost_LIBRARIES}
        ${QT_LIBRARIES}
+       ${CMAKE_THREAD_LIBS_INIT}
 )
 
 if(STATIC_PKGDEPS_LIBS)