diff options
| author | Ivo van Dongen <info@ivovandongen.nl> | 2016-07-26 13:55:04 -0400 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-08-05 11:42:22 +0200 |
| commit | 6ccdd7d4817ea550db0578fa63da5d0f9335297b (patch) | |
| tree | 1e536a8723ca44ad7b1606b4f8a68cc74db80331 | |
| parent | 163fc3c11350e714978b3f06daac5df931828152 (diff) | |
| download | qtlocation-mapboxgl-6ccdd7d4817ea550db0578fa63da5d0f9335297b.tar.gz | |
[build] copy custom-layer-example.so to the right sub-module
| -rw-r--r-- | platform/android/config.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index e4976930f7..b5924b110e 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -92,18 +92,20 @@ target_link_libraries(example-custom-layer 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_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}/) add_custom_target(copy-files DEPENDS mapbox-gl DEPENDS example-custom-layer COMMAND ${CMAKE_COMMAND} -E make_directory ${ANDROID_JNI_TARGET_DIR} COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:mapbox-gl> ${ANDROID_JNI_TARGET_DIR} - COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:example-custom-layer> ${ANDROID_JNI_TARGET_DIR} COMMAND ${CMAKE_COMMAND} -E make_directory ${ANDROID_ASSETS_TARGET_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/common/ca-bundle.crt ${ANDROID_ASSETS_TARGET_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/platform/default/resources/api_mapbox_com-digicert.der ${ANDROID_ASSETS_TARGET_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/platform/default/resources/api_mapbox_com-geotrust.der ${ANDROID_ASSETS_TARGET_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/platform/default/resources/star_tilestream_net.der ${ANDROID_ASSETS_TARGET_DIR} + COMMAND ${CMAKE_COMMAND} -E make_directory ${ANDROID_TEST_APP_JNI_TARGET_DIR} + COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:example-custom-layer> ${ANDROID_TEST_APP_JNI_TARGET_DIR} ) add_custom_target(_all ALL |