diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-10-18 17:33:27 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2018-10-23 12:23:40 +0200 |
| commit | 282c71e8e9a8ec9c2eab612f2e60a71b15d24c8a (patch) | |
| tree | 2d5a7d0f9b054af2686fe94dfa8c5690e8c92e72 /platform/android | |
| parent | 729eeeb3f821981cc5d3c9e06ffbb85ed4d857d7 (diff) | |
| download | qtlocation-mapboxgl-282c71e8e9a8ec9c2eab612f2e60a71b15d24c8a.tar.gz | |
[core] unify UTF-8/16 conversion to <boost/locale/encoding_utf.hpp>
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/config.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index cc44c2585c..ec64b239f8 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -69,7 +69,6 @@ macro(mbgl_filesource) target_add_mason_package(mbgl-filesource PUBLIC jni.hpp) target_link_libraries(mbgl-filesource - PRIVATE codecvt PUBLIC sqlite PUBLIC -llog PUBLIC -landroid @@ -84,8 +83,11 @@ add_library(mapbox-gl SHARED platform/android/src/main.cpp ) +target_include_directories(mapbox-gl + PRIVATE src +) + target_link_libraries(mapbox-gl - PRIVATE codecvt PRIVATE mbgl-core PRIVATE mbgl-filesource ) @@ -106,7 +108,6 @@ macro(mbgl_platform_test) ) target_link_libraries(mbgl-test - PRIVATE codecvt PRIVATE mbgl-core PRIVATE mbgl-filesource ) |