diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-01-27 12:12:06 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2017-01-27 14:52:21 +0100 |
| commit | a253a15a7c61f6c0fbdeca69cd6ca813a9b8d40f (patch) | |
| tree | 53e414b40741bc8721e5320e94e452c3e08eabd5 /platform | |
| parent | 329051a1ebcf1d4983041838a6ac932f3e7981c5 (diff) | |
| download | qtlocation-mapboxgl-a253a15a7c61f6c0fbdeca69cd6ca813a9b8d40f.tar.gz | |
[linux] update CA bundle and add script for automated updates
also removes the ca-bundle.crt from the Android build, since it's entirely unused
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/config.cmake | 18 | ||||
| -rw-r--r-- | platform/linux/config.cmake | 7 |
2 files changed, 7 insertions, 18 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index 7d522a1212..326ddb612a 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -32,20 +32,6 @@ set(ANDROID_JNI_TARGET_DIR ${ANDROID_SDK_PROJECT_DIR}/src/main/jniLibs/${ANDROID 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}) -macro(mbgl_android_copy_asset source target) - add_custom_command( - OUTPUT ${ANDROID_ASSETS_TARGET_DIR}/${target} - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/${source} ${ANDROID_ASSETS_TARGET_DIR}/${target} - DEPENDS ${CMAKE_SOURCE_DIR}/${source} - ) -endmacro() - -mbgl_android_copy_asset(common/ca-bundle.crt ca-bundle.crt) - -add_custom_target(mbgl-copy-android-assets - DEPENDS ${ANDROID_ASSETS_TARGET_DIR}/ca-bundle.crt -) - ## mbgl core ## macro(mbgl_platform_core) @@ -194,10 +180,6 @@ add_library(mapbox-gl SHARED platform/android/src/main.cpp ) -add_dependencies(mapbox-gl - mbgl-copy-android-assets -) - target_compile_options(mapbox-gl PRIVATE -fvisibility=hidden PRIVATE -ffunction-sections diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index caf91fdce2..ac1a195822 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -110,6 +110,13 @@ macro(mbgl_platform_glfw) target_link_libraries(mbgl-glfw PRIVATE mbgl-loop ) + + add_custom_command( + TARGET mbgl-glfw POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_SOURCE_DIR}/common/ca-bundle.crt + ${CMAKE_CURRENT_BINARY_DIR}/ca-bundle.crt + ) endmacro() |