diff options
| author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2020-04-21 21:03:48 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-04-27 19:47:30 +0300 |
| commit | 4457f5ced9e4ac2454df4c719e7e8f3e1f55b39a (patch) | |
| tree | e4a8c5cf52814bd534c31e6d0b52411c06850e03 | |
| parent | de12a0647dd1d0681d051ff7e3797356db149a52 (diff) | |
| download | qtlocation-mapboxgl-4457f5ced9e4ac2454df4c719e7e8f3e1f55b39a.tar.gz | |
Build default http stack if MBGL_PUBLIC_BUILD is set
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | platform/android/android.cmake | 2 | ||||
| -rw-r--r-- | platform/ios/ios.cmake | 2 | ||||
| -rw-r--r-- | platform/linux/linux.cmake | 2 | ||||
| -rw-r--r-- | platform/macos/macos.cmake | 2 | ||||
| -rw-r--r-- | platform/qt/qt.cmake | 8 |
6 files changed, 12 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6232c7df1a..fe079f6d98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1023,6 +1023,10 @@ endif() include(${PROJECT_SOURCE_DIR}/scripts/license.cmake) +if(NOT EXISTS ${PROJECT_SOURCE_DIR}/internal/internal.cmake) + set(MBGL_PUBLIC_BUILD TRUE) +endif() + if(MBGL_WITH_QT) include(${PROJECT_SOURCE_DIR}/platform/qt/qt.cmake) elseif(CMAKE_SYSTEM_NAME STREQUAL Android) diff --git a/platform/android/android.cmake b/platform/android/android.cmake index 6547496bce..625bf3a172 100644 --- a/platform/android/android.cmake +++ b/platform/android/android.cmake @@ -146,7 +146,7 @@ if(ANDROID_NATIVE_API_LEVEL VERSION_LESS 24) else() target_sources( mbgl-test-runner - PRIVATE ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/http_file_source.cpp + PRIVATE $<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/http_file_source.cpp> ) include(${PROJECT_SOURCE_DIR}/vendor/curl.cmake) diff --git a/platform/ios/ios.cmake b/platform/ios/ios.cmake index cab63e2824..2f79188b13 100644 --- a/platform/ios/ios.cmake +++ b/platform/ios/ios.cmake @@ -35,7 +35,7 @@ target_sources( PRIVATE ${PROJECT_SOURCE_DIR}/platform/darwin/src/async_task.cpp ${PROJECT_SOURCE_DIR}/platform/darwin/src/collator.mm - ${PROJECT_SOURCE_DIR}/platform/darwin/src/http_file_source.mm + $<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/darwin/src/http_file_source.mm> ${PROJECT_SOURCE_DIR}/platform/darwin/src/image.mm ${PROJECT_SOURCE_DIR}/platform/darwin/src/local_glyph_rasterizer.mm ${PROJECT_SOURCE_DIR}/platform/darwin/src/logging_nslog.mm diff --git a/platform/linux/linux.cmake b/platform/linux/linux.cmake index 47395df7c6..971f68ce4a 100644 --- a/platform/linux/linux.cmake +++ b/platform/linux/linux.cmake @@ -23,7 +23,7 @@ target_sources( ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/database_file_source.cpp ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/file_source_manager.cpp ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/file_source_request.cpp - ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/http_file_source.cpp + $<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/http_file_source.cpp> ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/local_file_request.cpp ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/local_file_source.cpp ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/main_resource_loader.cpp diff --git a/platform/macos/macos.cmake b/platform/macos/macos.cmake index 94beead508..3cd4df090f 100644 --- a/platform/macos/macos.cmake +++ b/platform/macos/macos.cmake @@ -26,7 +26,7 @@ target_sources( PRIVATE ${PROJECT_SOURCE_DIR}/platform/darwin/src/async_task.cpp ${PROJECT_SOURCE_DIR}/platform/darwin/src/collator.mm - ${PROJECT_SOURCE_DIR}/platform/darwin/src/http_file_source.mm + $<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/darwin/src/http_file_source.mm> ${PROJECT_SOURCE_DIR}/platform/darwin/src/image.mm ${PROJECT_SOURCE_DIR}/platform/darwin/src/local_glyph_rasterizer.mm ${PROJECT_SOURCE_DIR}/platform/darwin/src/logging_nslog.mm diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index fdb26e5308..8184d5079c 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -51,10 +51,10 @@ target_sources( ${PROJECT_SOURCE_DIR}/platform/qt/src/number_format.cpp ${PROJECT_SOURCE_DIR}/platform/qt/src/gl_functions.cpp ${PROJECT_SOURCE_DIR}/platform/qt/src/headless_backend_qt.cpp - ${PROJECT_SOURCE_DIR}/platform/qt/src/http_file_source.cpp - ${PROJECT_SOURCE_DIR}/platform/qt/src/http_file_source.hpp - ${PROJECT_SOURCE_DIR}/platform/qt/src/http_request.cpp - ${PROJECT_SOURCE_DIR}/platform/qt/src/http_request.hpp + $<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/qt/src/http_file_source.cpp> + $<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/qt/src/http_file_source.hpp> + $<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/qt/src/http_request.cpp> + $<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/qt/src/http_request.hpp> ${PROJECT_SOURCE_DIR}/platform/qt/src/local_glyph_rasterizer.cpp ${PROJECT_SOURCE_DIR}/platform/qt/src/qt_image.cpp ${PROJECT_SOURCE_DIR}/platform/qt/src/qt_logging.cpp |