Skip to content

Commit 02e6ec1

Browse files
authoredAug 11, 2018
Merge pull request #7591 from m-kuhn/fixAndroidNative
Fix android native
2 parents bcaf597 + f98cc11 commit 02e6ec1

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed
 

‎src/native/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ IF(WIN32)
5555
)
5656
ENDIF(WIN32)
5757

58-
IF(UNIX AND NOT APPLE)
58+
IF(UNIX AND NOT APPLE AND NOT ANDROID)
5959
SET(QGIS_APP_LINUX_SRCS
6060
linux/qgslinuxnative.cpp
6161
)
6262
SET(QGIS_NATIVE_SRCS ${QGIS_NATIVE_SRCS}
6363
${QGIS_APP_LINUX_SRCS}
6464
)
65-
ENDIF(UNIX AND NOT APPLE)
65+
ENDIF(UNIX AND NOT APPLE AND NOT ANDROID)
6666

6767
SET(QGIS_NATIVE_HDRS
6868
qgsnative.h
@@ -144,9 +144,9 @@ TARGET_LINK_LIBRARIES(qgis_native
144144
"${NATIVE_LINK_LIBS}"
145145
)
146146

147-
IF (UNIX AND NOT APPLE)
147+
IF (UNIX AND NOT APPLE AND NOT ANDROID)
148148
TARGET_LINK_LIBRARIES(qgis_native Qt5DBus)
149-
ENDIF (UNIX AND NOT APPLE)
149+
ENDIF (UNIX AND NOT APPLE AND NOT ANDROID)
150150

151151
IF (WIN32)
152152
FIND_PACKAGE(Qt5WinExtras)

0 commit comments

Comments
 (0)
Please sign in to comment.