Android: Use environment setup from library instead

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd423f6b5500b0f985689a71a81b4d60282865b8..069ccd898b8be8501434840c16db3c28325b1750 100644 (file)
--- 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})
 
@@ -243,12 +247,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 +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})
@@ -339,6 +341,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}