cmake create qtandroidserialport in libs/qtandroidserialport

libs/CMakeLists.txt

 
 add_subdirectory(qwt)
+add_subdirectory(qtandroidserialport)
 

libs/qtandroidserialport/CMakeLists.txt

+
+if (ANDROID)
+	add_library(qtandroidserialport
+		src/qserialport.cpp
+		src/qserialport_android.cpp
+		src/qserialportinfo.cpp
+		src/qserialportinfo_android.cpp
+	)
+
+	target_link_libraries(qtandroidserialport
+	)
+
+	target_include_directories(qtandroidserialport INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+endif()

src/CMakeLists.txt

 
-
 include_directories(
 	.
 	${CMAKE_CURRENT_BINARY_DIR}
@@ -13,17 +12,6 @@ if(MOBILE)
 	list(APPEND EXTRA_SRC
 		MobileScreenMgr.cc
 	)
-
-	if (ANDROID)
-		list(APPEND EXTRA_SRC
-			libs/qtandroidserialport/src/qserialport.cpp
-			libs/qtandroidserialport/src/qserialport_android.cpp
-			libs/qtandroidserialport/src/qserialportinfo.cpp
-			libs/qtandroidserialport/src/qserialportinfo_android.cpp
-
-			Joystick/JoystickAndroid.cc
-		)
-	endif()
 endif()
 
 if(BUILD_TESTING)
@@ -74,9 +62,6 @@ if(BUILD_TESTING)
 	add_qgc_test(TCPLinkTest)
 	add_qgc_test(TransectStyleComplexItemTest)
 
-endif()
-
-if(BUILD_TESTING)
 	list(APPEND QGC_RESOURCES
 		UnitTest.qrc
 	)
@@ -85,7 +70,6 @@ endif()
 add_library(qgc
 
 	${QGC_RESOURCES}
-	${QGC_UI}
 
 	${EXTRA_SRC}
 

src/Joystick/CMakeLists.txt

 
+set(EXTRA_SRC)
+
+if (ANDROID)
+	list(APPEND EXTRA_SRC
+		JoystickAndroid.cc
+	)
+endif()
+
 add_library(Joystick
 	Joystick.cc
 	JoystickManager.cc
 	JoystickSDL.cc
+	${EXTRA_SRC}
 )
 
 target_link_libraries(Joystick