Skip to content
This repository was archived by the owner on Aug 8, 2023. It is now read-only.

Commit 4457f5c

Browse files
alexshalamovtmpsantos
authored andcommitted
Build default http stack if MBGL_PUBLIC_BUILD is set
1 parent de12a06 commit 4457f5c

File tree

6 files changed

+12
-8
lines changed

6 files changed

+12
-8
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,6 +1023,10 @@ endif()
10231023

10241024
include(${PROJECT_SOURCE_DIR}/scripts/license.cmake)
10251025

1026+
if(NOT EXISTS ${PROJECT_SOURCE_DIR}/internal/internal.cmake)
1027+
set(MBGL_PUBLIC_BUILD TRUE)
1028+
endif()
1029+
10261030
if(MBGL_WITH_QT)
10271031
include(${PROJECT_SOURCE_DIR}/platform/qt/qt.cmake)
10281032
elseif(CMAKE_SYSTEM_NAME STREQUAL Android)

platform/android/android.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ if(ANDROID_NATIVE_API_LEVEL VERSION_LESS 24)
146146
else()
147147
target_sources(
148148
mbgl-test-runner
149-
PRIVATE ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/http_file_source.cpp
149+
PRIVATE $<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/http_file_source.cpp>
150150
)
151151

152152
include(${PROJECT_SOURCE_DIR}/vendor/curl.cmake)

platform/ios/ios.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ target_sources(
3535
PRIVATE
3636
${PROJECT_SOURCE_DIR}/platform/darwin/src/async_task.cpp
3737
${PROJECT_SOURCE_DIR}/platform/darwin/src/collator.mm
38-
${PROJECT_SOURCE_DIR}/platform/darwin/src/http_file_source.mm
38+
$<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/darwin/src/http_file_source.mm>
3939
${PROJECT_SOURCE_DIR}/platform/darwin/src/image.mm
4040
${PROJECT_SOURCE_DIR}/platform/darwin/src/local_glyph_rasterizer.mm
4141
${PROJECT_SOURCE_DIR}/platform/darwin/src/logging_nslog.mm

platform/linux/linux.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ target_sources(
2323
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/database_file_source.cpp
2424
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/file_source_manager.cpp
2525
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/file_source_request.cpp
26-
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/http_file_source.cpp
26+
$<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/http_file_source.cpp>
2727
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/local_file_request.cpp
2828
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/local_file_source.cpp
2929
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/main_resource_loader.cpp

platform/macos/macos.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ target_sources(
2626
PRIVATE
2727
${PROJECT_SOURCE_DIR}/platform/darwin/src/async_task.cpp
2828
${PROJECT_SOURCE_DIR}/platform/darwin/src/collator.mm
29-
${PROJECT_SOURCE_DIR}/platform/darwin/src/http_file_source.mm
29+
$<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/darwin/src/http_file_source.mm>
3030
${PROJECT_SOURCE_DIR}/platform/darwin/src/image.mm
3131
${PROJECT_SOURCE_DIR}/platform/darwin/src/local_glyph_rasterizer.mm
3232
${PROJECT_SOURCE_DIR}/platform/darwin/src/logging_nslog.mm

platform/qt/qt.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ target_sources(
5151
${PROJECT_SOURCE_DIR}/platform/qt/src/number_format.cpp
5252
${PROJECT_SOURCE_DIR}/platform/qt/src/gl_functions.cpp
5353
${PROJECT_SOURCE_DIR}/platform/qt/src/headless_backend_qt.cpp
54-
${PROJECT_SOURCE_DIR}/platform/qt/src/http_file_source.cpp
55-
${PROJECT_SOURCE_DIR}/platform/qt/src/http_file_source.hpp
56-
${PROJECT_SOURCE_DIR}/platform/qt/src/http_request.cpp
57-
${PROJECT_SOURCE_DIR}/platform/qt/src/http_request.hpp
54+
$<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/qt/src/http_file_source.cpp>
55+
$<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/qt/src/http_file_source.hpp>
56+
$<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/qt/src/http_request.cpp>
57+
$<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/qt/src/http_request.hpp>
5858
${PROJECT_SOURCE_DIR}/platform/qt/src/local_glyph_rasterizer.cpp
5959
${PROJECT_SOURCE_DIR}/platform/qt/src/qt_image.cpp
6060
${PROJECT_SOURCE_DIR}/platform/qt/src/qt_logging.cpp

0 commit comments

Comments
 (0)