X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=dd423f6b5500b0f985689a71a81b4d60282865b8;hb=82b23ce7958e67d33e22868c9f42cb81484a0ed3;hp=3d63ecde143f291f179054ad6e278325c66153f0;hpb=9632990d5428efb120d1085d4f441ad371d447fc;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d63ecd..dd423f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,7 +77,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})
@@ -243,6 +243,12 @@ if(ENABLE_DECODE)
 		pv/widgets/decodergroupbox.h
 		pv/widgets/decodermenu.h
 	)
+
+	if(ANDROID)
+		list(APPEND pulseview_SOURCES
+			    android/envsetup.cpp
+		)
+	endif()
 endif()
 
 if(WIN32)
@@ -333,12 +339,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})