diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-02-08 13:26:23 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2017-02-08 19:07:16 +0100 |
| commit | bb931505c5f11c21a31cdd7be6fe036ca44e729d (patch) | |
| tree | e0310f3a4965dbe364639efb610d96eeca49ee19 /platform/android/config.cmake | |
| parent | f5b86c0f11bc921647d1f677b62a14527bfb50c3 (diff) | |
| download | qtlocation-mapboxgl-bb931505c5f11c21a31cdd7be6fe036ca44e729d.tar.gz | |
[build] Remove Mason submodule in favor of CMake mason
Diffstat (limited to 'platform/android/config.cmake')
| -rw-r--r-- | platform/android/config.cmake | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index 9d8858ac0d..cfd6a3cdb5 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -2,9 +2,6 @@ add_definitions(-DMBGL_USE_GLES2=1) include(cmake/test-files.cmake) -#Include to use build specific variables -include(${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake) - # Build thin archives. set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>") set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>") @@ -18,17 +15,17 @@ if ((ANDROID_ABI STREQUAL "armeabi") OR (ANDROID_ABI STREQUAL "armeabi-v7a") OR set(CMAKE_SHARED_LINKER_FLAGS "-fuse-ld=gold -Wl,--icf=safe ${CMAKE_SHARED_LINKER_FLAGS}") endif() -mason_use(jni.hpp VERSION 2.0.0 HEADER_ONLY) +mason_use(jni.hpp VERSION 2.0.0-1 HEADER_ONLY) mason_use(libzip VERSION 1.1.3) mason_use(nunicode VERSION 1.7.1) mason_use(sqlite VERSION 3.14.2) -mason_use(gtest VERSION 1.7.0) +mason_use(gtest VERSION 1.8.0) mason_use(icu VERSION 58.1) set(ANDROID_SDK_PROJECT_DIR ${CMAKE_SOURCE_DIR}/platform/android/MapboxGLAndroidSDK) -set(ANDROID_JNI_TARGET_DIR ${ANDROID_SDK_PROJECT_DIR}/src/main/jniLibs/${ANDROID_JNIDIR}) +set(ANDROID_JNI_TARGET_DIR ${ANDROID_SDK_PROJECT_DIR}/src/main/jniLibs/${ANDROID_ABI}) set(ANDROID_ASSETS_TARGET_DIR ${ANDROID_SDK_PROJECT_DIR}/src/main/assets) -set(ANDROID_TEST_APP_JNI_TARGET_DIR ${CMAKE_SOURCE_DIR}/platform/android/MapboxGLAndroidSDKTestApp/src/main/jniLibs/${ANDROID_JNIDIR}) +set(ANDROID_TEST_APP_JNI_TARGET_DIR ${CMAKE_SOURCE_DIR}/platform/android/MapboxGLAndroidSDKTestApp/src/main/jniLibs/${ANDROID_ABI}) ## mbgl core ## |