X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=8ee1d57a3d6ac2d29e826f31967c9090018c0b7a;hp=2fd35b1c3a1ee389fa1587ff2c2cafdf624c2686;hb=726ea66712afefafd96b4f08667fa97ab741c343;hpb=dac1bb975265d33e7aeb0e3fc0342260613af9d1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fd35b1c..8ee1d57a 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)
@@ -81,17 +81,23 @@ if(Qt5Core_FOUND)
 	message("-- Using Qt5")
 	find_package(Qt5Widgets REQUIRED)
 	find_package(Qt5Gui REQUIRED)
+	find_package(Qt5Svg REQUIRED)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
 	set(QT_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
-	set(QT_LIBRARIES Qt5::Gui Qt5::Widgets)
+	set(QT_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::Svg)
 	add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS})
 else()
 	find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
 	find_package(Qt4 REQUIRED)
+	set(QT_USE_QTSVG TRUE)
 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
 #-------------------------------------------------------------------------------
@@ -136,10 +142,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
@@ -182,7 +184,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
@@ -194,6 +195,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
@@ -318,6 +320,7 @@ link_directories(${Boost_LIBRARY_DIRS})
 set(PULSEVIEW_LINK_LIBS
 	${Boost_LIBRARIES}
 	${QT_LIBRARIES}
+	${CMAKE_THREAD_LIBS_INIT}
 )
 
 if(STATIC_PKGDEPS_LIBS)