Skip to content
Permalink
Browse files
Merge pull request #7591 from m-kuhn/fixAndroidNative
Fix android native
  • Loading branch information
m-kuhn committed Aug 11, 2018
2 parents bcaf597 + f98cc11 commit 02e6ec19aa1e003128c6c86d1c5055922856e9e5
Showing with 4 additions and 4 deletions.
  1. +4 −4 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)

0 comments on commit 02e6ec1

Please sign in to comment.