tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove internal build support (#1000)

Browse Source
This commit is contained in:
Tadej Novak
2023-04-14 22:56:45 +02:00
committed by GitHub
parent 8ff6704fc4
commit 12fcba89bf
7 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@@ -1089,20 +1089,12 @@ add_library(
Mapbox::Map ALIAS mbgl-core Mapbox::Map ALIAS mbgl-core
) )
if(MBGL_WITH_PLATFORM_EXTRAS)
include(${MBGL_WITH_PLATFORM_EXTRAS})
endif()
if(MBGL_WITH_CORE_ONLY) if(MBGL_WITH_CORE_ONLY)
return() return()
endif() endif()
include(${PROJECT_SOURCE_DIR}/scripts/license.cmake) 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) if(MBGL_WITH_QT)
include(${PROJECT_SOURCE_DIR}/platform/qt/qt.cmake) include(${PROJECT_SOURCE_DIR}/platform/qt/qt.cmake)
elseif(CMAKE_SYSTEM_NAME STREQUAL Android) elseif(CMAKE_SYSTEM_NAME STREQUAL Android)
@@ -1122,7 +1114,3 @@ endif()
add_subdirectory(${PROJECT_SOURCE_DIR}/test) add_subdirectory(${PROJECT_SOURCE_DIR}/test)
add_subdirectory(${PROJECT_SOURCE_DIR}/benchmark) add_subdirectory(${PROJECT_SOURCE_DIR}/benchmark)
add_subdirectory(${PROJECT_SOURCE_DIR}/render-test) add_subdirectory(${PROJECT_SOURCE_DIR}/render-test)
if(EXISTS ${PROJECT_SOURCE_DIR}/internal/internal.cmake)
include(${PROJECT_SOURCE_DIR}/internal/internal.cmake)
endif()

2
platform/android/android.cmake
View File

@@ -147,7 +147,7 @@ if(ANDROID_NATIVE_API_LEVEL VERSION_LESS 24)
else() else()
target_sources( target_sources(
mbgl-test-runner mbgl-test-runner
PRIVATE $<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/http_file_source.cpp> PRIVATE ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/http_file_source.cpp
) )
include(${PROJECT_SOURCE_DIR}/vendor/curl.cmake) include(${PROJECT_SOURCE_DIR}/vendor/curl.cmake)

8
platform/ios/ios.cmake
View File

@@ -39,17 +39,11 @@ if(MBGL_WITH_OPENGL)
) )
endif() endif()
if(MBGL_PUBLIC_BUILD)
list(APPEND
PLATFORM_FILES
${PROJECT_SOURCE_DIR}/platform/darwin/src/http_file_source.mm
)
endif()
list(APPEND list(APPEND
PLATFORM_FILES PLATFORM_FILES
${PROJECT_SOURCE_DIR}/platform/darwin/src/async_task.cpp ${PROJECT_SOURCE_DIR}/platform/darwin/src/async_task.cpp
${PROJECT_SOURCE_DIR}/platform/darwin/src/collator.mm ${PROJECT_SOURCE_DIR}/platform/darwin/src/collator.mm
${PROJECT_SOURCE_DIR}/platform/darwin/src/http_file_source.mm
${PROJECT_SOURCE_DIR}/platform/darwin/src/image.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/local_glyph_rasterizer.mm
${PROJECT_SOURCE_DIR}/platform/darwin/src/logging_nslog.mm ${PROJECT_SOURCE_DIR}/platform/darwin/src/logging_nslog.mm

2
platform/linux/linux.cmake
View File

@@ -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/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_manager.cpp
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/file_source_request.cpp ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/file_source_request.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/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_request.cpp
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/local_file_source.cpp ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/local_file_source.cpp
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/mbtiles_file_source.cpp ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/mbtiles_file_source.cpp

2
platform/macos/macos.cmake
View File

@@ -35,7 +35,7 @@ target_sources(
PRIVATE PRIVATE
${PROJECT_SOURCE_DIR}/platform/darwin/src/async_task.cpp ${PROJECT_SOURCE_DIR}/platform/darwin/src/async_task.cpp
${PROJECT_SOURCE_DIR}/platform/darwin/src/collator.mm ${PROJECT_SOURCE_DIR}/platform/darwin/src/collator.mm
$<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/darwin/src/http_file_source.mm> ${PROJECT_SOURCE_DIR}/platform/darwin/src/http_file_source.mm
${PROJECT_SOURCE_DIR}/platform/darwin/src/image.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/local_glyph_rasterizer.mm
${PROJECT_SOURCE_DIR}/platform/darwin/src/logging_nslog.mm ${PROJECT_SOURCE_DIR}/platform/darwin/src/logging_nslog.mm

8
platform/qt/qt.cmake
View File

@@ -101,10 +101,10 @@ target_sources(
${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/async_task.cpp ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/async_task.cpp
${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/async_task_impl.hpp ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/async_task_impl.hpp
${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/gl_functions.cpp ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/gl_functions.cpp
$<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_file_source.cpp> ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_file_source.cpp
$<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_file_source.hpp> ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_file_source.hpp
$<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_request.cpp> ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_request.cpp
$<$<BOOL:${MBGL_PUBLIC_BUILD}>:${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_request.hpp> ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_request.hpp
${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/image.cpp ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/image.cpp
${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/number_format.cpp ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/number_format.cpp
${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/local_glyph_rasterizer.cpp ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/local_glyph_rasterizer.cpp

2
platform/windows/windows.cmake
View File

@@ -40,7 +40,7 @@ target_sources(
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/database_file_source.cpp ${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_manager.cpp
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/file_source_request.cpp ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/file_source_request.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/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_request.cpp
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/local_file_source.cpp ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/local_file_source.cpp
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/mbtiles_file_source.cpp ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/storage/mbtiles_file_source.cpp