CMakeLists.txt: For Android, make a library out of the native code

diff --git a/.gitignore b/.gitignore
index a673c5f6e3bf388f12e61eb9925c5d18de83e8ec..dc8ab9c692b71688daf100bd72efee261978f56d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 
 pulseview
 pulseview-test
+libpulseview.so
 
 # CMake cruft
 *.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40e61e22a1f2d0c1679a4f6b63e9766499424461..b9654940d21acf9d1b5c5e6f3dd900f31fc1f9ca 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -333,12 +333,21 @@ if(WIN32)
        list(APPEND PULSEVIEW_LINK_LIBS "-lqsvg")
 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})