X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=069ccd898b8be8501434840c16db3c28325b1750;hp=3d63ecde143f291f179054ad6e278325c66153f0;hb=aff5174622cf79c6d42c0adbcb9ddbafdf1b96d1;hpb=9632990d5428efb120d1085d4f441ad371d447fc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d63ecde..069ccd89 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})
 
@@ -77,7 +81,7 @@ if(Qt5Core_FOUND)
 	message("-- Using Qt5")
 	find_package(Qt5Widgets REQUIRED)
 	find_package(Qt5Gui REQUIRED)
-	set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS})
+	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)
 	add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS})
@@ -252,6 +256,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})
@@ -333,12 +341,25 @@ 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}
+	${pulseview_HEADERS_MOC}
+	${pulseview_FORMS_HEADERS}
+	${pulseview_RESOURCES_RCC}
+)
+else()
 add_executable(${PROJECT_NAME}
 	${pulseview_SOURCES}
 	${pulseview_HEADERS_MOC}
 	${pulseview_FORMS_HEADERS}
 	${pulseview_RESOURCES_RCC}
 )
+endif()
 
 target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})