X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=8e2ac69505984c9094cf2c98d54f2dd39962d1f9;hp=dd423f6b5500b0f985689a71a81b4d60282865b8;hb=6dcdb3258f6f0b25e69154b5919405a194b7e724;hpb=82b23ce7958e67d33e22868c9f42cb81484a0ed3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd423f6b..8e2ac695 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,12 +58,16 @@ 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)
 endif()
 
+if(ANDROID)
+	list(APPEND PKGDEPS libsigrokandroidutils>=0.1.0)
+endif()
+
 find_package(PkgConfig)
 pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
 
@@ -77,16 +81,21 @@ 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_package(Boost 1.42 COMPONENTS filesystem system thread 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
@@ -120,6 +129,7 @@ configure_file (
 
 set(pulseview_SOURCES
 	main.cpp
+	pv/application.cpp
 	pv/devicemanager.cpp
 	pv/mainwindow.cpp
 	pv/sigsession.cpp
@@ -131,16 +141,11 @@ 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/inputfile.cpp
-	pv/device/sessionfile.cpp
 	pv/dialogs/about.cpp
 	pv/dialogs/connect.cpp
 	pv/dialogs/storeprogress.cpp
 	pv/popups/deviceoptions.cpp
-	pv/popups/probes.cpp
+	pv/popups/channels.cpp
 	pv/prop/bool.cpp
 	pv/prop/double.cpp
 	pv/prop/enum.cpp
@@ -157,11 +162,14 @@ set(pulseview_SOURCES
 	pv/view/header.cpp
 	pv/view/marginwidget.cpp
 	pv/view/logicsignal.cpp
+	pv/view/rowitem.cpp
+	pv/view/rowitemowner.cpp
 	pv/view/ruler.cpp
 	pv/view/selectableitem.cpp
 	pv/view/signal.cpp
 	pv/view/timemarker.cpp
 	pv/view/trace.cpp
+	pv/view/tracegroup.cpp
 	pv/view/tracepalette.cpp
 	pv/view/view.cpp
 	pv/view/viewport.cpp
@@ -178,11 +186,10 @@ 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
-	pv/popups/probes.h
+	pv/popups/channels.h
 	pv/popups/deviceoptions.h
 	pv/prop/bool.h
 	pv/prop/double.h
@@ -190,17 +197,20 @@ 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
 	pv/view/header.h
 	pv/view/logicsignal.h
 	pv/view/marginwidget.h
+	pv/view/rowitem.h
 	pv/view/ruler.h
 	pv/view/selectableitem.h
 	pv/view/signal.h
 	pv/view/timemarker.h
 	pv/view/trace.h
+	pv/view/tracegroup.h
 	pv/view/view.h
 	pv/view/viewport.h
 	pv/widgets/colourbutton.h
@@ -243,12 +253,6 @@ if(ENABLE_DECODE)
 		pv/widgets/decodergroupbox.h
 		pv/widgets/decodermenu.h
 	)
-
-	if(ANDROID)
-		list(APPEND pulseview_SOURCES
-			    android/envsetup.cpp
-		)
-	endif()
 endif()
 
 if(WIN32)
@@ -258,6 +262,10 @@ if(WIN32)
 	list(APPEND pulseview_SOURCES pulseviewico.rc)
 endif()
 
+if(ANDROID)
+	list(APPEND pulseview_SOURCES android/loghandler.cpp)
+endif()
+
 if(Qt5Core_FOUND)
 	qt5_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
 	qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
@@ -273,7 +281,7 @@ endif()
 #= Global Definitions
 #-------------------------------------------------------------------------------
 
-add_definitions(${QT_DEFINITIONS})
+add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS)
 add_definitions(-D__STDC_LIMIT_MACROS)
 add_definitions(-Wall -Wextra)
 add_definitions(-std=c++11)
@@ -316,6 +324,7 @@ link_directories(${Boost_LIBRARY_DIRS})
 set(PULSEVIEW_LINK_LIBS
 	${Boost_LIBRARIES}
 	${QT_LIBRARIES}
+	${CMAKE_THREAD_LIBS_INIT}
 )
 
 if(STATIC_PKGDEPS_LIBS)
@@ -335,8 +344,12 @@ 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)
+	list(APPEND PULSEVIEW_LINK_LIBS "-llog")
 endif()
 
 if(ANDROID)