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

Create macOS amalgamation for core releases (#3768)

Browse Source
This commit is contained in:
Bart Louwers
2025-09-02 22:13:38 +02:00
committed by GitHub
parent 764f73c97a
commit 9b6325a14e
7 changed files with 93 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
platform/linux/cmake/find_static_library.cmake
View File

@@ -1,32 +0,0 @@
function(find_static_library result_list_var)
# Usage: find_static_library(LIST_VAR NAMES name1 [name2 ...])
set(options)
set(one_value_args)
set(multi_value_args NAMES)
cmake_parse_arguments(FSL "${options}" "${one_value_args}" "${multi_value_args}" ${ARGN})
if(NOT FSL_NAMES)
message(FATAL_ERROR "find_static_library: NAMES argument required")
endif()
# Temporarily restrict to static libs
set(_old_suffixes ${CMAKE_FIND_LIBRARY_SUFFIXES})
set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
foreach(lib_name IN LISTS FSL_NAMES)
unset(_found_lib CACHE)
find_library(_found_lib NAMES ${lib_name})
if(_found_lib)
message(STATUS "find_static_library: Found static [${lib_name}] -> ${_found_lib}")
# Append to result list and return early
set(${result_list_var} "${${result_list_var}};${_found_lib}" PARENT_SCOPE)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_old_suffixes})
return()
endif()
endforeach()
# Restore original suffix list
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_old_suffixes})
message(FATAL_ERROR "find_static_library: could not find any of the specified static libraries: ${FSL_NAMES}")
endfunction()

2
platform/linux/linux.cmake
View File

@@ -184,7 +184,7 @@ target_link_libraries(
# Bundle system provided libraries
if(NOT MLN_USE_BUILTIN_ICU AND NOT "${ARMERGE}" STREQUAL "ARMERGE-NOTFOUND")
message(STATUS "Found armerge: ${ARMERGE}")
include(${CMAKE_CURRENT_LIST_DIR}/cmake/find_static_library.cmake)
include(${PROJECT_SOURCE_DIR}/cmake/find_static_library.cmake)
set(STATIC_LIBS "")
find_static_library(STATIC_LIBS NAMES png)

26
platform/macos/macos.cmake
View File

@@ -142,3 +142,29 @@ add_test(
${PROJECT_SOURCE_DIR}/test/storage/server.js
$<TARGET_FILE:mbgl-test-runner>
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
find_program(ARMERGE NAMES armerge)
if(NOT "${ARMERGE}" STREQUAL "ARMERGE-NOTFOUND")
message(STATUS "Found armerge: ${ARMERGE}")
include(${PROJECT_SOURCE_DIR}/cmake/find_static_library.cmake)
set(STATIC_LIBS "")
find_static_library(STATIC_LIBS NAMES png)
find_static_library(STATIC_LIBS NAMES jpeg)
find_static_library(STATIC_LIBS NAMES webp)
find_static_library(STATIC_LIBS NAMES uv uv_a)
add_custom_command(
TARGET mbgl-core
POST_BUILD
COMMAND armerge --keep-symbols 'mbgl.*' --output libmbgl-core-amalgam.a
$<TARGET_FILE:mbgl-core>
$<TARGET_FILE:freetype>
$<TARGET_FILE:mbgl-vendor-csscolorparser>
$<TARGET_FILE:harfbuzz>
$<TARGET_FILE:mbgl-vendor-parsedate>
${STATIC_LIBS}
)
endif()