summaryrefslogtreecommitdiff
path: root/platform/android
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2018-11-16 17:53:17 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2018-11-16 18:58:30 +0200
commit9be6c8b1b77f8fc026caee8a09e0cf28e0781253 (patch)
treeaa642ad3a8c4aa0555581002846cceadbfed4ce9 /platform/android
parent8757ccddb0d3eb8b271e903244fabe6a21b401a1 (diff)
downloadqtlocation-mapboxgl-9be6c8b1b77f8fc026caee8a09e0cf28e0781253.tar.gz
[build] Add more vendor packages
* jni.hpp * cheap-ruler-cpp * pixelmatch-cpp
Diffstat (limited to 'platform/android')
-rw-r--r--platform/android/config.cmake6
1 files changed, 2 insertions, 4 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake
index 0e10e2af10..8c94842de5 100644
--- a/platform/android/config.cmake
+++ b/platform/android/config.cmake
@@ -42,9 +42,8 @@ macro(mbgl_platform_core)
PRIVATE platform/android
)
- target_add_mason_package(mbgl-core PUBLIC jni.hpp)
-
target_link_libraries(mbgl-core
+ PUBLIC jni.hpp
PUBLIC -llog
PUBLIC -landroid
PUBLIC -ljnigraphics
@@ -61,10 +60,9 @@ macro(mbgl_filesource)
# Modify platform/android/filesource-files.txt to change the source files for this target.
target_sources_from_file(mbgl-filesource PRIVATE platform/android/filesource-files.txt)
- target_add_mason_package(mbgl-filesource PUBLIC jni.hpp)
-
target_link_libraries(mbgl-filesource
PUBLIC sqlite
+ PUBLIC jni.hpp
PUBLIC -llog
PUBLIC -landroid
PUBLIC -lstdc++