fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2025-12-22 09:19:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Meta+Libraries+AK: Append Cxx to imported library module names in swift

Browse Source 
At the same time, simplify CMakeLists magic for libraries that want to
include Swift code in the library. The Lib-less name of the library is
now always the module name for the library with any Swift additions,
extensions, etc. All vfs overlays now live in a common location to make
finding them easier from CMake functions. A new pattern is needed for
the Lib-less modules to re-export their Cxx counterparts.
This commit is contained in:
Andrew Kaster
2024-08-26 19:04:05 -06:00
committed by Andrew Kaster
parent f27d638e0a
commit c5153cb398
13 changed files with 68 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Userland/Libraries/LibWeb/CMakeLists.txt
View File

@@ -800,36 +800,11 @@ if (ENABLE_SWIFT)
generate_clang_module_map(LibWeb GENERATED_FILES ${LIBWEB_ALL_GENERATED_HEADERS})
target_compile_features(LibWeb PUBLIC cxx_std_23)
target_sources(LibWeb PRIVATE
HTML/Parser/HTMLToken.swift
HTML/Parser/HTMLTokenizer.swift
HTML/Parser/HTMLTokenizerHelpers.cpp
)
target_compile_definitions(LibWeb PRIVATE LIBWEB_USE_SWIFT)
set_target_properties(LibWeb PROPERTIES Swift_MODULE_NAME "SwiftLibWeb")
target_link_libraries(LibWeb PRIVATE AK Collections)
# FIXME: These should be pulled automatically from interface compile options for the target
set(VFS_OVERLAY_OPTIONS
-Xcc -ivfsoverlay${CMAKE_CURRENT_BINARY_DIR}/vfs_overlay.yaml
-Xcc -ivfsoverlay${CMAKE_CURRENT_BINARY_DIR}/../LibGfx/vfs_overlay.yaml
-Xcc -ivfsoverlay${Lagom_BINARY_DIR}/AK/vfs_overlay.yaml
)
get_target_property(LIBWEB_NATIVE_DIRS LibWeb INCLUDE_DIRECTORIES)
list(APPEND LIBWEB_NATIVE_DIRS ${CMAKE_Swift_MODULE_DIRECTORY})
_swift_generate_cxx_header(LibWeb "LibWeb-Swift.h"
SEARCH_PATHS ${LIBWEB_NATIVE_DIRS}
COMPILE_OPTIONS ${VFS_OVERLAY_OPTIONS}
)
# FIXME: https://gitlab.kitware.com/cmake/cmake/-/issues/26175
if (APPLE)
add_custom_command(TARGET LibWeb POST_BUILD
COMMAND install_name_tool -id @rpath/liblagom-web.0.dylib "$<TARGET_FILE:LibWeb>"
)
endif()
add_swift_target_properties(LibWeb LAGOM_LIBRARIES AK LibGfx)
endif()