Merge pull request #7591 from m-kuhn/fixAndroidNative

m-kuhn · web-flow · commit 02e6ec19aa1e · 2018-08-11T07:24:34.000+02:00
Fix android native
diff --git a/src/native/CMakeLists.txt b/src/native/CMakeLists.txt
@@ -55,14 +55,14 @@ IF(WIN32)
   )
 ENDIF(WIN32)
 
-IF(UNIX AND NOT APPLE)
+IF(UNIX AND NOT APPLE AND NOT ANDROID)
   SET(QGIS_APP_LINUX_SRCS
     linux/qgslinuxnative.cpp
   )
   SET(QGIS_NATIVE_SRCS ${QGIS_NATIVE_SRCS}
     ${QGIS_APP_LINUX_SRCS}
   )
-ENDIF(UNIX AND NOT APPLE)
+ENDIF(UNIX AND NOT APPLE AND NOT ANDROID)
 
 SET(QGIS_NATIVE_HDRS
   qgsnative.h
@@ -144,9 +144,9 @@ TARGET_LINK_LIBRARIES(qgis_native
     "${NATIVE_LINK_LIBS}"
     )
 
-IF (UNIX AND NOT APPLE)
+IF (UNIX AND NOT APPLE AND NOT ANDROID)
   TARGET_LINK_LIBRARIES(qgis_native Qt5DBus)
-ENDIF (UNIX AND NOT APPLE)
+ENDIF (UNIX AND NOT APPLE AND NOT ANDROID)
 
 IF (WIN32)
   FIND_PACKAGE(Qt5WinExtras)

Original file line number	Diff line number	Diff line change
`@@ -55,14 +55,14 @@ IF(WIN32)`
`55`	`55`	`)`
`56`	`56`	`ENDIF(WIN32)`
`57`	`57`
`58`		`-IF(UNIX AND NOT APPLE)`
	`58`	`+IF(UNIX AND NOT APPLE AND NOT ANDROID)`
`59`	`59`	`SET(QGIS_APP_LINUX_SRCS`
`60`	`60`	`linux/qgslinuxnative.cpp`
`61`	`61`	`)`
`62`	`62`	`SET(QGIS_NATIVE_SRCS ${QGIS_NATIVE_SRCS}`
`63`	`63`	`${QGIS_APP_LINUX_SRCS}`
`64`	`64`	`)`
`65`		`-ENDIF(UNIX AND NOT APPLE)`
	`65`	`+ENDIF(UNIX AND NOT APPLE AND NOT ANDROID)`
`66`	`66`
`67`	`67`	`SET(QGIS_NATIVE_HDRS`
`68`	`68`	`qgsnative.h`
`@@ -144,9 +144,9 @@ TARGET_LINK_LIBRARIES(qgis_native`
`144`	`144`	`"${NATIVE_LINK_LIBS}"`
`145`	`145`	`)`
`146`	`146`
`147`		`-IF (UNIX AND NOT APPLE)`
	`147`	`+IF (UNIX AND NOT APPLE AND NOT ANDROID)`
`148`	`148`	`TARGET_LINK_LIBRARIES(qgis_native Qt5DBus)`
`149`		`-ENDIF (UNIX AND NOT APPLE)`
	`149`	`+ENDIF (UNIX AND NOT APPLE AND NOT ANDROID)`
`150`	`150`
`151`	`151`	`IF (WIN32)`
`152`	`152`	`FIND_PACKAGE(Qt5WinExtras)`