X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=27859b3ad0674bcf48dbe16203229391dad0b82e;hb=2b76309a072d2493ee1b5293955b72abfd84b8be;hp=b9654940d21acf9d1b5c5e6f3dd900f31fc1f9ca;hpb=268070612773203845e9b24cb3052158d7548980;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b965494..27859b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,10 @@ 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})
 
@@ -88,6 +92,8 @@ endif()
 
 find_package(Boost 1.42 COMPONENTS filesystem system REQUIRED)
 
+find_package(Threads REQUIRED)
+
 #===============================================================================
 #= System Introspection
 #-------------------------------------------------------------------------------
@@ -120,6 +126,7 @@ configure_file (
 
 set(pulseview_SOURCES
 	main.cpp
+	pv/application.cpp
 	pv/devicemanager.cpp
 	pv/mainwindow.cpp
 	pv/sigsession.cpp
@@ -134,13 +141,12 @@ set(pulseview_SOURCES
 	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
@@ -182,7 +188,7 @@ set(pulseview_HEADERS
 	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
@@ -252,6 +258,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})
@@ -267,7 +277,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)
@@ -310,6 +320,7 @@ link_directories(${Boost_LIBRARY_DIRS})
 set(PULSEVIEW_LINK_LIBS
 	${Boost_LIBRARIES}
 	${QT_LIBRARIES}
+	${CMAKE_THREAD_LIBS_INIT}
 )
 
 if(STATIC_PKGDEPS_LIBS)
@@ -333,6 +344,10 @@ if(WIN32)
 	list(APPEND PULSEVIEW_LINK_LIBS "-lqsvg")
 endif()
 
+if(ANDROID)
+	list(APPEND PULSEVIEW_LINK_LIBS "-llog")
+endif()
+
 if(ANDROID)
 add_library(${PROJECT_NAME} SHARED
 	${pulseview_SOURCES}