Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,12 @@ core/merginsecrets.cpp
test/temp_projects/
test/temp_extra_projects/
input.pro.user*
app/android/assets/qgis-data/proj_custom/
app/android/assets/qgis-data/projects/
app/android/assets/qgis-data/proj
app/android/assets/qgis-data/resources
app/android/assets/projects/
app/android/assets
app/android/AndroidManifest.xml
app/android/build.gradle
app/android/.gradle
*.gpkg-wal
*.gpkg-shm
Input_keystore.keystore
CMakeLists.txt.user
app/android/build.gradle
app/android/.gradle/*
app/android/.gradle
.github/secrets/ios/LutraConsulting*.mobileprovision
17 changes: 13 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -380,16 +380,25 @@ endif ()
# RESOURCES
# ########################################################################################
message(STATUS "Copying proj and qgis resources to android/assets/qgis-data")
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/app/android/assets/qgis-data/resources)

# On android we need to copy the resources into the source tree and then Qt will copy it
# to the android build directory with QT_ANDROID_PACKAGE_SOURCE_DIR
if (ANDROID)
set(ASSETS_DIR_PATH ${CMAKE_CURRENT_SOURCE_DIR})
else ()
set(ASSETS_DIR_PATH ${CMAKE_BINARY_DIR})
endif ()

file(MAKE_DIRECTORY ${ASSETS_DIR_PATH}/app/android/assets/qgis-data/resources)
file(COPY ${QGIS_RESOURCE_DIR}/qgis.db
DESTINATION ${CMAKE_BINARY_DIR}/app/android/assets/qgis-data/resources/
DESTINATION ${ASSETS_DIR_PATH}/app/android/assets/qgis-data/resources/
)
file(COPY ${QGIS_RESOURCE_DIR}/srs.db
DESTINATION ${CMAKE_BINARY_DIR}/app/android/assets/qgis-data/resources/
DESTINATION ${ASSETS_DIR_PATH}/app/android/assets/qgis-data/resources/
)
file(
COPY ${PROJ_DIR}
DESTINATION ${CMAKE_BINARY_DIR}/app/android/assets/qgis-data/
DESTINATION ${ASSETS_DIR_PATH}/app/android/assets/qgis-data/
PATTERN "*.cmake" EXCLUDE
PATTERN "vcpkg*" EXCLUDE
)
Expand Down
Loading