Merge pull request #7591 from m-kuhn/fixAndroidNative

Fix android native
This commit is contained in:
Matthias Kuhn 2018-08-11 07:24:34 +02:00 committed by GitHub
commit 02e6ec19aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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)