From 12fcba89bfff055fc8ad9087970353854d142578 Mon Sep 17 00:00:00 2001 From: Tadej Novak Date: Fri, 14 Apr 2023 22:56:45 +0200 Subject: [PATCH] Remove internal build support (#1000) --- CMakeLists.txt | 12 ------------ platform/android/android.cmake | 2 +- platform/ios/ios.cmake | 8 +------- platform/linux/linux.cmake | 2 +- platform/macos/macos.cmake | 2 +- platform/qt/qt.cmake | 8 ++++---- platform/windows/windows.cmake | 2 +- 7 files changed, 9 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 630016c7a..27d82ae95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1089,20 +1089,12 @@ add_library( Mapbox::Map ALIAS mbgl-core ) -if(MBGL_WITH_PLATFORM_EXTRAS) - include(${MBGL_WITH_PLATFORM_EXTRAS}) -endif() - if(MBGL_WITH_CORE_ONLY) return() 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) @@ -1122,7 +1114,3 @@ endif() add_subdirectory(${PROJECT_SOURCE_DIR}/test) add_subdirectory(${PROJECT_SOURCE_DIR}/benchmark) add_subdirectory(${PROJECT_SOURCE_DIR}/render-test) - -if(EXISTS ${PROJECT_SOURCE_DIR}/internal/internal.cmake) - include(${PROJECT_SOURCE_DIR}/internal/internal.cmake) -endif() diff --git a/platform/android/android.cmake b/platform/android/android.cmake index 7a810f06d..dc2433eb7 100644 --- a/platform/android/android.cmake +++ b/platform/android/android.cmake @@ -147,7 +147,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 ${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 b028198e4..ecc975778 100644 --- a/platform/ios/ios.cmake +++ b/platform/ios/ios.cmake @@ -39,17 +39,11 @@ if(MBGL_WITH_OPENGL) ) endif() -if(MBGL_PUBLIC_BUILD) - list(APPEND - PLATFORM_FILES - ${PROJECT_SOURCE_DIR}/platform/darwin/src/http_file_source.mm - ) -endif() - list(APPEND PLATFORM_FILES ${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 ${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 9261b4ab8..18d9653ec 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> + ${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/mbtiles_file_source.cpp diff --git a/platform/macos/macos.cmake b/platform/macos/macos.cmake index cb20a9246..71f8f6564 100644 --- a/platform/macos/macos.cmake +++ b/platform/macos/macos.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> + ${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 166cfa60d..9cd46f19f 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -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_impl.hpp ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/gl_functions.cpp - $<$:${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_file_source.cpp> - $<$:${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_file_source.hpp> - $<$:${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_request.cpp> - $<$:${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_request.hpp> + ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_file_source.cpp + ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_file_source.hpp + ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/http_request.cpp + ${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/number_format.cpp ${PROJECT_SOURCE_DIR}/platform/qt/src/mbgl/local_glyph_rasterizer.cpp diff --git a/platform/windows/windows.cmake b/platform/windows/windows.cmake index 33c7f0859..1e006f70b 100644 --- a/platform/windows/windows.cmake +++ b/platform/windows/windows.cmake @@ -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/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> + ${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/mbtiles_file_source.cpp