Skip to content

Commit 94ff04b

Browse files
committed
adding support fo share folder
1 parent 904c893 commit 94ff04b

File tree

4 files changed

+198
-189
lines changed

4 files changed

+198
-189
lines changed

CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,10 @@ ELSE (WIN32)
329329

330330
ENDIF (WIN32)
331331

332+
IF (ANDROID)
333+
SET (DEFAULT_PLUGIN_SUBDIR lib)
334+
SET (DEFAULT_DATA_SUBDIR files/share)
335+
ENDIF (ANDROID)
332336

333337
#assume we have escaped compiler directives
334338
#eventually we want to change this to new

src/app/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ ENDIF (POSTGRES_FOUND)
393393

394394
#############
395395
IF (ANDROID)
396-
ADD_LIBRARY(${QGIS_APP_NAME} SHARED ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${INDEX_SRC} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS})
396+
ADD_LIBRARY(${QGIS_APP_NAME} SHARED ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${INDEX_SRC} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS} ${IMAGE_RCC_SRCS})
397397
ELSE (ANDROID)
398398
ADD_EXECUTABLE(${QGIS_APP_NAME} MACOSX_BUNDLE WIN32 ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS})
399399
ENDIF (ANDROID)

0 commit comments

Comments
 (0)