X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=da3cc09cc096a1b2ef7bf73e80de6053dc2072c2;hp=27859b3ad0674bcf48dbe16203229391dad0b82e;hb=7f8517f63ab9ff98938ceee486bb94c0aa80b74b;hpb=2b76309a072d2493ee1b5293955b72abfd84b8be

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27859b3a..da3cc09c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,10 +23,10 @@ cmake_minimum_required(VERSION 2.8.6)
 include(FindPkgConfig)
 include(GNUInstallDirs)
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
-
 project(pulseview)
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
+
 #===============================================================================
 #= User Options
 #-------------------------------------------------------------------------------
@@ -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,20 @@ 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)
+	find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
 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 +141,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 +183,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 +194,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
@@ -340,8 +339,8 @@ if(WIN32)
 	# plugin (and the QtSvg component) for SVG graphics/icons to work.
 	add_definitions(-DQT_STATICPLUGIN)
 	link_directories("${QT_PLUGINS_DIR}/imageformats")
-	list(APPEND PULSEVIEW_LINK_LIBS ${QT_QTSVG_LIBRARY})
 	list(APPEND PULSEVIEW_LINK_LIBS "-lqsvg")
+	list(APPEND PULSEVIEW_LINK_LIBS ${QT_QTSVG_LIBRARY})
 endif()
 
 if(ANDROID)