mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-07-29 12:19:54 +00:00
CMake: Rename serenity_* helper functions/macros to ladybird_*
This commit is contained in:
ayeteadoe
Jelle Raaijmakers
parent
100b204a68
commit
25f5936dee
Notes:
github-actions[bot]
2025-07-03 21:21:29 +00:00
Author: https://github.com/ayeteadoe
Commit: 25f5936dee
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/5249
Reviewed-by: https://github.com/gmta ✅
53 changed files with 104 additions and 104 deletions
|
|
@ -44,7 +44,7 @@ else()
|
|||
list(APPEND SOURCES LexicalPath.cpp)
|
||||
endif()
|
||||
|
||||
serenity_lib(AK ak)
|
||||
ladybird_lib(AK ak)
|
||||
|
||||
include(stacktrace)
|
||||
configure_file(Backtrace.h.in Backtrace.h @ONLY)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ set(SOURCES
|
|||
Zlib.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibCompress compress)
|
||||
ladybird_lib(LibCompress compress)
|
||||
target_link_libraries(LibCompress PRIVATE LibCore LibCrypto)
|
||||
|
||||
find_package(ZLIB REQUIRED)
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ else()
|
|||
System.cpp)
|
||||
endif()
|
||||
|
||||
serenity_lib(LibCoreMinimal coreminimal)
|
||||
ladybird_lib(LibCoreMinimal coreminimal)
|
||||
|
||||
if (WIN32)
|
||||
find_path(DIRENT_INCLUDE_DIR dirent.h REQUIRED)
|
||||
|
|
@ -106,7 +106,7 @@ if (APPLE)
|
|||
list(APPEND SOURCES IOSurface.cpp)
|
||||
endif()
|
||||
|
||||
serenity_lib(LibCore core)
|
||||
ladybird_lib(LibCore core)
|
||||
target_link_libraries(LibCore PRIVATE LibUnicode LibURL Threads::Threads)
|
||||
target_link_libraries(LibCore PUBLIC LibCoreMinimal)
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ set(SOURCES
|
|||
SecureRandom.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibCrypto crypto)
|
||||
ladybird_lib(LibCrypto crypto)
|
||||
|
||||
find_package(PkgConfig REQUIRED)
|
||||
pkg_check_modules(libtommath REQUIRED IMPORTED_TARGET libtommath)
|
||||
|
|
|
|||
|
|
@ -2,5 +2,5 @@ set(SOURCES
|
|||
Message.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibDNS dns)
|
||||
ladybird_lib(LibDNS dns)
|
||||
target_link_libraries(LibDNS PRIVATE LibCore PUBLIC LibCrypto)
|
||||
|
|
|
|||
|
|
@ -23,5 +23,5 @@ set(SOURCES
|
|||
DevToolsServer.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibDevTools devtools)
|
||||
ladybird_lib(LibDevTools devtools)
|
||||
target_link_libraries(LibDevTools PRIVATE LibCore LibWeb)
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@ set(SOURCES
|
|||
Generator.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibDiff diff)
|
||||
ladybird_lib(LibDiff diff)
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ if (NOT WIN32)
|
|||
list(APPEND SOURCES TempFile.cpp)
|
||||
endif()
|
||||
|
||||
serenity_lib(LibFileSystem filesystem)
|
||||
ladybird_lib(LibFileSystem filesystem)
|
||||
target_link_libraries(LibFileSystem PRIVATE LibCoreMinimal)
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ set(SOURCES
|
|||
WeakContainer.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibGC gc EXPLICIT_SYMBOL_EXPORT)
|
||||
ladybird_lib(LibGC gc EXPLICIT_SYMBOL_EXPORT)
|
||||
target_link_libraries(LibGC PRIVATE LibCore)
|
||||
|
||||
if (ENABLE_SWIFT)
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ if (HAS_FONTCONFIG)
|
|||
list(APPEND SOURCES Font/GlobalFontConfig.cpp)
|
||||
endif()
|
||||
|
||||
serenity_lib(LibGfx gfx)
|
||||
ladybird_lib(LibGfx gfx)
|
||||
|
||||
target_link_libraries(LibGfx PRIVATE LibCompress LibCore LibCrypto LibFileSystem LibTextCodec LibIPC LibUnicode)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ set(SOURCES
|
|||
HttpResponse.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibHTTP http)
|
||||
ladybird_lib(LibHTTP http)
|
||||
target_link_libraries(LibHTTP PRIVATE LibCompress LibCore LibTLS LibURL)
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ set(SOURCES
|
|||
Types.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibIDL idl)
|
||||
ladybird_lib(LibIDL idl)
|
||||
target_link_libraries(LibIDL PRIVATE LibCoreMinimal LibFileSystem)
|
||||
|
|
|
|||
|
|
@ -16,5 +16,5 @@ else()
|
|||
TransportSocketWindows.cpp)
|
||||
endif()
|
||||
|
||||
serenity_lib(LibIPC ipc)
|
||||
ladybird_lib(LibIPC ipc)
|
||||
target_link_libraries(LibIPC PRIVATE LibCore LibURL LibThreading)
|
||||
|
|
|
|||
|
|
@ -12,5 +12,5 @@ set(GENERATED_SOURCES
|
|||
../../Services/ImageDecoder/ImageDecoderServerEndpoint.h
|
||||
)
|
||||
|
||||
serenity_lib(LibImageDecoderClient imagedecoderclient)
|
||||
ladybird_lib(LibImageDecoderClient imagedecoderclient)
|
||||
target_link_libraries(LibImageDecoderClient PRIVATE LibCore LibIPC LibGfx)
|
||||
|
|
|
|||
|
|
@ -267,7 +267,7 @@ set(SOURCES
|
|||
Token.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibJS js EXPLICIT_SYMBOL_EXPORT)
|
||||
ladybird_lib(LibJS js EXPLICIT_SYMBOL_EXPORT)
|
||||
target_link_libraries(LibJS PRIVATE LibCore LibCrypto LibFileSystem LibRegex LibSyntax LibGC)
|
||||
|
||||
# Link LibUnicode publicly to ensure ICU data (which is in libicudata.a) is available in any process using LibJS.
|
||||
|
|
|
|||
|
|
@ -6,5 +6,5 @@ set(SOURCES
|
|||
XtermSuggestionDisplay.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibLine line)
|
||||
ladybird_lib(LibLine line)
|
||||
target_link_libraries(LibLine PRIVATE LibCore LibUnicode)
|
||||
|
|
|
|||
|
|
@ -2,4 +2,4 @@ set(SOURCES
|
|||
Main.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibMain main TYPE STATIC)
|
||||
ladybird_lib(LibMain main TYPE STATIC)
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ set(SOURCES
|
|||
VideoFrame.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibMedia media)
|
||||
ladybird_lib(LibMedia media)
|
||||
target_link_libraries(LibMedia PRIVATE LibCore LibCrypto LibIPC LibGfx LibThreading LibUnicode)
|
||||
|
||||
if (NOT ANDROID)
|
||||
|
|
|
|||
|
|
@ -10,5 +10,5 @@ if(SERENITYOS)
|
|||
list(APPEND SOURCES C/Regex.cpp)
|
||||
endif()
|
||||
|
||||
serenity_lib(LibRegex regex EXPLICIT_SYMBOL_EXPORT)
|
||||
ladybird_lib(LibRegex regex EXPLICIT_SYMBOL_EXPORT)
|
||||
target_link_libraries(LibRegex PRIVATE LibUnicode)
|
||||
|
|
|
|||
|
|
@ -10,5 +10,5 @@ set(GENERATED_SOURCES
|
|||
../../Services/RequestServer/RequestServerEndpoint.h
|
||||
)
|
||||
|
||||
serenity_lib(LibRequests requests)
|
||||
ladybird_lib(LibRequests requests)
|
||||
target_link_libraries(LibRequests PRIVATE LibCore LibIPC)
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@ set(SOURCES
|
|||
Language.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibSyntax syntax)
|
||||
ladybird_lib(LibSyntax syntax)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ set(SOURCES
|
|||
TLSv12.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibTLS tls)
|
||||
ladybird_lib(LibTLS tls)
|
||||
target_link_libraries(LibTLS PRIVATE LibCore LibCrypto LibFileSystem)
|
||||
|
||||
find_package(OpenSSL REQUIRED)
|
||||
|
|
|
|||
|
|
@ -11,4 +11,4 @@ set(GENERATED_SOURCES
|
|||
LookupTables.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibTextCodec textcodec)
|
||||
ladybird_lib(LibTextCodec textcodec)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ set(SOURCES
|
|||
Thread.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibThreading threading)
|
||||
ladybird_lib(LibThreading threading)
|
||||
target_link_libraries(LibThreading PRIVATE LibCore)
|
||||
|
||||
if (WIN32)
|
||||
|
|
|
|||
|
|
@ -19,5 +19,5 @@ set(SOURCES
|
|||
Pattern/Tokenizer.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibURL url)
|
||||
ladybird_lib(LibURL url)
|
||||
target_link_libraries(LibURL PRIVATE LibUnicode LibTextCodec LibRegex LibCrypto)
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ set(SOURCES
|
|||
|
||||
set(GENERATED_SOURCES ${CURRENT_LIB_GENERATED})
|
||||
|
||||
serenity_lib(LibUnicode unicode)
|
||||
ladybird_lib(LibUnicode unicode)
|
||||
|
||||
find_package(ICU 76 REQUIRED COMPONENTS data i18n uc)
|
||||
target_link_libraries(LibUnicode PRIVATE ICU::i18n ICU::uc ICU::data)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ if (NOT WIN32)
|
|||
list(APPEND SOURCES WASI/Wasi.cpp)
|
||||
endif()
|
||||
|
||||
serenity_lib(LibWasm wasm)
|
||||
ladybird_lib(LibWasm wasm)
|
||||
target_link_libraries(LibWasm PRIVATE LibCore)
|
||||
|
||||
include(wasm_spec_tests)
|
||||
|
|
|
|||
|
|
@ -993,7 +993,7 @@ set(GENERATED_SOURCES
|
|||
HTML/Parser/NamedCharacterReferences.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibWeb web)
|
||||
ladybird_lib(LibWeb web)
|
||||
|
||||
target_link_libraries(LibWeb PRIVATE LibCore LibCompress LibCrypto LibJS LibHTTP LibGfx LibIPC LibRegex LibSyntax LibTextCodec LibUnicode LibMedia LibWasm LibXML LibIDL LibURL LibTLS LibRequests LibGC LibThreading skia unofficial::angle::libEGL unofficial::angle::libGLESv2)
|
||||
|
||||
|
|
|
|||
|
|
@ -5,5 +5,5 @@ set(SOURCES
|
|||
WebSocket.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibWebSocket websocket)
|
||||
ladybird_lib(LibWebSocket websocket)
|
||||
target_link_libraries(LibWebSocket PRIVATE LibCore LibCrypto LibTLS LibURL LibDNS)
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ set(GENERATED_SOURCES
|
|||
UIProcessServerEndpoint.h
|
||||
)
|
||||
|
||||
serenity_lib(LibWebView webview)
|
||||
ladybird_lib(LibWebView webview)
|
||||
target_link_libraries(LibWebView PRIVATE LibCore LibDevTools LibFileSystem LibGfx LibImageDecoderClient LibIPC LibRequests LibJS LibWeb LibUnicode LibURL LibSyntax LibTextCodec)
|
||||
|
||||
if (APPLE)
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@ set(SOURCES
|
|||
DOM/Node.cpp
|
||||
)
|
||||
|
||||
serenity_lib(LibXML xml)
|
||||
ladybird_lib(LibXML xml)
|
||||
|
|
|
|||
|
|
@ -14,31 +14,31 @@ if (POLICY CMP0140)
|
|||
cmake_policy(SET CMP0140 NEW)
|
||||
endif()
|
||||
|
||||
serenity_option(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries instead of static libraries")
|
||||
ladybird_option(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries instead of static libraries")
|
||||
|
||||
serenity_option(ENABLE_COMPILETIME_FORMAT_CHECK ON CACHE BOOL "Enable compiletime format string checks")
|
||||
serenity_option(ENABLE_UNDEFINED_SANITIZER OFF CACHE BOOL "Enable undefined behavior sanitizer testing in gcc/clang")
|
||||
serenity_option(UNDEFINED_BEHAVIOR_IS_FATAL OFF CACHE BOOL "Make undefined behavior sanitizer errors non-recoverable")
|
||||
ladybird_option(ENABLE_COMPILETIME_FORMAT_CHECK ON CACHE BOOL "Enable compiletime format string checks")
|
||||
ladybird_option(ENABLE_UNDEFINED_SANITIZER OFF CACHE BOOL "Enable undefined behavior sanitizer testing in gcc/clang")
|
||||
ladybird_option(UNDEFINED_BEHAVIOR_IS_FATAL OFF CACHE BOOL "Make undefined behavior sanitizer errors non-recoverable")
|
||||
|
||||
serenity_option(ENABLE_ALL_THE_DEBUG_MACROS OFF CACHE BOOL "Enable all debug macros to validate they still compile")
|
||||
serenity_option(ENABLE_ALL_DEBUG_FACILITIES OFF CACHE BOOL "Enable all noisy debug symbols and options. Not recommended for normal developer use")
|
||||
serenity_option(ENABLE_COMPILETIME_HEADER_CHECK OFF CACHE BOOL "Enable compiletime check that each library header compiles stand-alone")
|
||||
ladybird_option(ENABLE_ALL_THE_DEBUG_MACROS OFF CACHE BOOL "Enable all debug macros to validate they still compile")
|
||||
ladybird_option(ENABLE_ALL_DEBUG_FACILITIES OFF CACHE BOOL "Enable all noisy debug symbols and options. Not recommended for normal developer use")
|
||||
ladybird_option(ENABLE_COMPILETIME_HEADER_CHECK OFF CACHE BOOL "Enable compiletime check that each library header compiles stand-alone")
|
||||
|
||||
serenity_option(INCLUDE_WASM_SPEC_TESTS OFF CACHE BOOL "Download and include the WebAssembly spec testsuite")
|
||||
serenity_option(INCLUDE_FLAC_SPEC_TESTS OFF CACHE BOOL "Download and include the FLAC spec testsuite")
|
||||
serenity_option(ENABLE_CACERT_DOWNLOAD ON CACHE BOOL "Enable download of cacert.pem at build time")
|
||||
ladybird_option(INCLUDE_WASM_SPEC_TESTS OFF CACHE BOOL "Download and include the WebAssembly spec testsuite")
|
||||
ladybird_option(INCLUDE_FLAC_SPEC_TESTS OFF CACHE BOOL "Download and include the FLAC spec testsuite")
|
||||
ladybird_option(ENABLE_CACERT_DOWNLOAD ON CACHE BOOL "Enable download of cacert.pem at build time")
|
||||
|
||||
serenity_option(SERENITY_CACHE_DIR "${PROJECT_BINARY_DIR}/../caches" CACHE PATH "Location of shared cache of downloaded files")
|
||||
serenity_option(ENABLE_NETWORK_DOWNLOADS ON CACHE BOOL "Allow downloads of required files. If OFF, required files must already be present in SERENITY_CACHE_DIR")
|
||||
ladybird_option(SERENITY_CACHE_DIR "${PROJECT_BINARY_DIR}/../caches" CACHE PATH "Location of shared cache of downloaded files")
|
||||
ladybird_option(ENABLE_NETWORK_DOWNLOADS ON CACHE BOOL "Allow downloads of required files. If OFF, required files must already be present in SERENITY_CACHE_DIR")
|
||||
|
||||
serenity_option(ENABLE_CLANG_PLUGINS OFF CACHE BOOL "Enable building with the Clang plugins")
|
||||
serenity_option(ENABLE_CLANG_PLUGINS_INVALID_FUNCTION_MEMBERS OFF CACHE BOOL "Enable detecting invalid function types as members of GC-allocated objects")
|
||||
ladybird_option(ENABLE_CLANG_PLUGINS OFF CACHE BOOL "Enable building with the Clang plugins")
|
||||
ladybird_option(ENABLE_CLANG_PLUGINS_INVALID_FUNCTION_MEMBERS OFF CACHE BOOL "Enable detecting invalid function types as members of GC-allocated objects")
|
||||
|
||||
serenity_option(ENABLE_GUI_TARGETS ON CACHE BOOL "Enable building GUI targets")
|
||||
serenity_option(ENABLE_INSTALL_HEADERS ON CACHE BOOL "Enable installing headers")
|
||||
serenity_option(ENABLE_SWIFT OFF CACHE BOOL "Enable building Swift files")
|
||||
serenity_option(ENABLE_STD_STACKTRACE OFF CACHE BOOL "Force use of std::stacktrace instead of libbacktrace. If it is not supported the build will fail")
|
||||
serenity_option(ENABLE_WINDOWS_CI OFF CACHE BOOL "Enable building targets supported on Windows for CI")
|
||||
ladybird_option(ENABLE_GUI_TARGETS ON CACHE BOOL "Enable building GUI targets")
|
||||
ladybird_option(ENABLE_INSTALL_HEADERS ON CACHE BOOL "Enable installing headers")
|
||||
ladybird_option(ENABLE_SWIFT OFF CACHE BOOL "Enable building Swift files")
|
||||
ladybird_option(ENABLE_STD_STACKTRACE OFF CACHE BOOL "Force use of std::stacktrace instead of libbacktrace. If it is not supported the build will fail")
|
||||
ladybird_option(ENABLE_WINDOWS_CI OFF CACHE BOOL "Enable building targets supported on Windows for CI")
|
||||
|
||||
if (ENABLE_FUZZERS_LIBFUZZER)
|
||||
# With libfuzzer, we need to avoid a duplicate main() linker error giving false negatives
|
||||
|
|
|
|||
|
|
@ -13,20 +13,20 @@ else()
|
|||
set(RELEASE_LTO_DEFAULT ON)
|
||||
endif()
|
||||
|
||||
serenity_option(ENABLE_ADDRESS_SANITIZER OFF CACHE BOOL "Enable address sanitizer testing in gcc/clang")
|
||||
serenity_option(ENABLE_MEMORY_SANITIZER OFF CACHE BOOL "Enable memory sanitizer testing in gcc/clang")
|
||||
serenity_option(ENABLE_FUZZERS OFF CACHE BOOL "Build fuzzing targets")
|
||||
serenity_option(ENABLE_FUZZERS_LIBFUZZER OFF CACHE BOOL "Build fuzzers using Clang's libFuzzer")
|
||||
serenity_option(ENABLE_FUZZERS_OSSFUZZ OFF CACHE BOOL "Build OSS-Fuzz compatible fuzzers")
|
||||
serenity_option(LAGOM_TOOLS_ONLY OFF CACHE BOOL "Don't build libraries, utilities and tests, only host build tools")
|
||||
serenity_option(ENABLE_LAGOM_CCACHE ON CACHE BOOL "Enable ccache for Lagom builds")
|
||||
serenity_option(LAGOM_USE_LINKER "" CACHE STRING "The linker to use (e.g. lld, mold) instead of the system default")
|
||||
serenity_option(LAGOM_LINK_POOL_SIZE "" CACHE STRING "The maximum number of parallel jobs to use for linking")
|
||||
serenity_option(ENABLE_LTO_FOR_RELEASE ${RELEASE_LTO_DEFAULT} CACHE BOOL "Enable link-time optimization for release builds")
|
||||
serenity_option(ENABLE_LAGOM_COVERAGE_COLLECTION OFF CACHE STRING "Enable code coverage instrumentation for lagom binaries in clang")
|
||||
ladybird_option(ENABLE_ADDRESS_SANITIZER OFF CACHE BOOL "Enable address sanitizer testing in gcc/clang")
|
||||
ladybird_option(ENABLE_MEMORY_SANITIZER OFF CACHE BOOL "Enable memory sanitizer testing in gcc/clang")
|
||||
ladybird_option(ENABLE_FUZZERS OFF CACHE BOOL "Build fuzzing targets")
|
||||
ladybird_option(ENABLE_FUZZERS_LIBFUZZER OFF CACHE BOOL "Build fuzzers using Clang's libFuzzer")
|
||||
ladybird_option(ENABLE_FUZZERS_OSSFUZZ OFF CACHE BOOL "Build OSS-Fuzz compatible fuzzers")
|
||||
ladybird_option(LAGOM_TOOLS_ONLY OFF CACHE BOOL "Don't build libraries, utilities and tests, only host build tools")
|
||||
ladybird_option(ENABLE_LAGOM_CCACHE ON CACHE BOOL "Enable ccache for Lagom builds")
|
||||
ladybird_option(LAGOM_USE_LINKER "" CACHE STRING "The linker to use (e.g. lld, mold) instead of the system default")
|
||||
ladybird_option(LAGOM_LINK_POOL_SIZE "" CACHE STRING "The maximum number of parallel jobs to use for linking")
|
||||
ladybird_option(ENABLE_LTO_FOR_RELEASE ${RELEASE_LTO_DEFAULT} CACHE BOOL "Enable link-time optimization for release builds")
|
||||
ladybird_option(ENABLE_LAGOM_COVERAGE_COLLECTION OFF CACHE STRING "Enable code coverage instrumentation for lagom binaries in clang")
|
||||
|
||||
if (ANDROID OR APPLE)
|
||||
serenity_option(ENABLE_QT OFF CACHE BOOL "Build ladybird application using Qt GUI")
|
||||
ladybird_option(ENABLE_QT OFF CACHE BOOL "Build ladybird application using Qt GUI")
|
||||
else()
|
||||
serenity_option(ENABLE_QT ON CACHE BOOL "Build ladybird application using Qt GUI")
|
||||
ladybird_option(ENABLE_QT ON CACHE BOOL "Build ladybird application using Qt GUI")
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ function(lagom_lib target_name fs_name)
|
|||
FILES_MATCHING PATTERN "*.h"
|
||||
)
|
||||
endif()
|
||||
serenity_generated_sources(${target_name})
|
||||
ladybird_generated_sources(${target_name})
|
||||
if (LAGOM_LIBRARY_EXPLICIT_SYMBOL_EXPORT)
|
||||
lagom_generate_export_header(${target_name} ${fs_name})
|
||||
endif()
|
||||
|
|
@ -97,7 +97,7 @@ function(lagom_utility name)
|
|||
target_link_libraries("${name}" PRIVATE AK LibCore ${LAGOM_UTILITY_LIBS})
|
||||
endfunction()
|
||||
|
||||
function(serenity_test test_src sub_dir)
|
||||
function(ladybird_test test_src sub_dir)
|
||||
cmake_parse_arguments(PARSE_ARGV 2 SERENITY_TEST "" "CUSTOM_MAIN;NAME" "LIBS")
|
||||
lagom_test(${test_src}
|
||||
LIBS ${SERENITY_TEST_LIBS}
|
||||
|
|
@ -107,7 +107,7 @@ function(serenity_test test_src sub_dir)
|
|||
)
|
||||
endfunction()
|
||||
|
||||
function(serenity_bin name)
|
||||
function(ladybird_bin name)
|
||||
add_executable(${name} ${SOURCES} ${GENERATED_SOURCES})
|
||||
add_executable(Lagom::${name} ALIAS ${name})
|
||||
target_link_libraries(${name} PUBLIC GenericClangPlugin)
|
||||
|
|
@ -124,10 +124,10 @@ function(serenity_bin name)
|
|||
INCLUDES #
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
||||
)
|
||||
serenity_generated_sources(${name})
|
||||
ladybird_generated_sources(${name})
|
||||
endfunction()
|
||||
|
||||
function(serenity_lib name fs_name)
|
||||
function(ladybird_lib name fs_name)
|
||||
cmake_parse_arguments(PARSE_ARGV 2 SERENITY_LIB "EXPLICIT_SYMBOL_EXPORT" "TYPE" "")
|
||||
set(EXPLICIT_SYMBOL_EXPORT "")
|
||||
if (SERENITY_LIB_EXPLICIT_SYMBOL_EXPORT)
|
||||
|
|
@ -136,7 +136,7 @@ function(serenity_lib name fs_name)
|
|||
lagom_lib(${name} ${fs_name} LIBRARY_TYPE ${SERENITY_LIB_TYPE} ${EXPLICIT_SYMBOL_EXPORT} SOURCES ${SOURCES} ${GENERATED_SOURCES})
|
||||
endfunction()
|
||||
|
||||
macro(add_serenity_subdirectory path)
|
||||
macro(add_ladybird_subdirectory path)
|
||||
add_subdirectory("${SERENITY_PROJECT_ROOT}/${path}" "${CMAKE_CURRENT_BINARY_DIR}/${path}")
|
||||
endmacro()
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/code_generators.cmake)
|
||||
|
||||
function(serenity_generated_sources target_name)
|
||||
function(ladybird_generated_sources target_name)
|
||||
if(DEFINED GENERATED_SOURCES)
|
||||
set_source_files_properties(${GENERATED_SOURCES} PROPERTIES GENERATED 1)
|
||||
foreach(generated ${GENERATED_SOURCES})
|
||||
|
|
@ -12,13 +12,13 @@ function(serenity_generated_sources target_name)
|
|||
endif()
|
||||
endfunction()
|
||||
|
||||
function(serenity_testjs_test test_src sub_dir)
|
||||
function(ladybird_testjs_test test_src sub_dir)
|
||||
cmake_parse_arguments(PARSE_ARGV 2 SERENITY_TEST "" "CUSTOM_MAIN" "LIBS")
|
||||
if ("${SERENITY_TEST_CUSTOM_MAIN}" STREQUAL "")
|
||||
set(SERENITY_TEST_CUSTOM_MAIN "$<TARGET_OBJECTS:JavaScriptTestRunnerMain>")
|
||||
endif()
|
||||
list(APPEND SERENITY_TEST_LIBS LibJS LibCore LibFileSystem)
|
||||
serenity_test(${test_src} ${sub_dir}
|
||||
ladybird_test(${test_src} ${sub_dir}
|
||||
CUSTOM_MAIN "${SERENITY_TEST_CUSTOM_MAIN}"
|
||||
LIBS ${SERENITY_TEST_LIBS})
|
||||
endfunction()
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ set(SerenityOS_SOURCE_DIR "${SERENITY_PROJECT_ROOT}" CACHE STRING "")
|
|||
|
||||
list(APPEND CMAKE_MODULE_PATH "${SERENITY_PROJECT_ROOT}/Meta/CMake")
|
||||
|
||||
if(NOT COMMAND serenity_option)
|
||||
macro(serenity_option)
|
||||
if(NOT COMMAND ladybird_option)
|
||||
macro(ladybird_option)
|
||||
set(${ARGV})
|
||||
endmacro()
|
||||
endif()
|
||||
|
|
@ -190,21 +190,21 @@ add_library(NoCoverage INTERFACE)
|
|||
install(TARGETS NoCoverage EXPORT LagomTargets)
|
||||
|
||||
# AK
|
||||
add_serenity_subdirectory(AK)
|
||||
add_ladybird_subdirectory(AK)
|
||||
|
||||
# LibCoreMinimal
|
||||
add_serenity_subdirectory(Libraries/LibCore)
|
||||
add_ladybird_subdirectory(Libraries/LibCore)
|
||||
|
||||
# LibMain
|
||||
add_serenity_subdirectory(Libraries/LibMain)
|
||||
add_ladybird_subdirectory(Libraries/LibMain)
|
||||
|
||||
# LibFileSystem
|
||||
# This is needed even if Lagom is not enabled because it is depended upon by code generators.
|
||||
add_serenity_subdirectory(Libraries/LibFileSystem)
|
||||
add_ladybird_subdirectory(Libraries/LibFileSystem)
|
||||
|
||||
# LibIDL
|
||||
# This is used by the BindingsGenerator so needs to always be built.
|
||||
add_serenity_subdirectory(Libraries/LibIDL)
|
||||
add_ladybird_subdirectory(Libraries/LibIDL)
|
||||
|
||||
# Code Generators and other host tools
|
||||
if (BUILD_LAGOM_TOOLS)
|
||||
|
|
@ -227,7 +227,7 @@ compile_ipc(${SERENITY_PROJECT_ROOT}/Services/WebContent/WebDriverServer.ipc Ser
|
|||
compile_ipc(${SERENITY_PROJECT_ROOT}/Services/WebContent/WebUIClient.ipc Services/WebContent/WebUIClientEndpoint.h)
|
||||
compile_ipc(${SERENITY_PROJECT_ROOT}/Services/WebContent/WebUIServer.ipc Services/WebContent/WebUIServerEndpoint.h)
|
||||
|
||||
add_serenity_subdirectory(Libraries)
|
||||
add_ladybird_subdirectory(Libraries)
|
||||
|
||||
if (ENABLE_FUZZERS)
|
||||
add_subdirectory(Fuzzers)
|
||||
|
|
@ -239,10 +239,10 @@ if (ENABLE_FUZZERS OR ENABLE_COMPILER_EXPLORER_BUILD OR ANDROID OR IOS)
|
|||
endif()
|
||||
|
||||
# Lagom Utilities
|
||||
add_serenity_subdirectory(Utilities)
|
||||
add_ladybird_subdirectory(Utilities)
|
||||
|
||||
# Tests
|
||||
include(CTest)
|
||||
if (BUILD_TESTING)
|
||||
add_serenity_subdirectory(Tests)
|
||||
add_ladybird_subdirectory(Tests)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ else()
|
|||
endif()
|
||||
|
||||
foreach(source IN LISTS AK_TEST_SOURCES)
|
||||
serenity_test("${source}" AK)
|
||||
ladybird_test("${source}" AK)
|
||||
endforeach()
|
||||
|
||||
if (WIN32)
|
||||
|
|
@ -101,11 +101,11 @@ if (WIN32)
|
|||
endif()
|
||||
|
||||
if (CXX_COMPILER_SUPPORTS_BLOCKS)
|
||||
serenity_test(TestFunction.mm AK NAME TestFunction)
|
||||
ladybird_test(TestFunction.mm AK NAME TestFunction)
|
||||
target_link_libraries(TestFunction PRIVATE ${BLOCKS_REQUIRED_LIBRARIES})
|
||||
endif()
|
||||
if (CXX_COMPILER_SUPPORTS_OBJC_ARC)
|
||||
serenity_test(TestFunction.mm AK NAME TestFunctionArc)
|
||||
ladybird_test(TestFunction.mm AK NAME TestFunctionArc)
|
||||
target_compile_options(TestFunctionArc PRIVATE -fobjc-arc)
|
||||
target_link_libraries(TestFunction PRIVATE ${BLOCKS_REQUIRED_LIBRARIES})
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -7,5 +7,5 @@ set(TEST_SOURCES
|
|||
)
|
||||
|
||||
foreach(source IN LISTS TEST_SOURCES)
|
||||
serenity_test("${source}" LibCompress LIBS LibCompress)
|
||||
ladybird_test("${source}" LibCompress LIBS LibCompress)
|
||||
endforeach()
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ if (NOT WIN32)
|
|||
endif()
|
||||
|
||||
foreach(source IN LISTS TEST_SOURCES)
|
||||
serenity_test("${source}" LibCore)
|
||||
ladybird_test("${source}" LibCore)
|
||||
endforeach()
|
||||
|
||||
target_link_libraries(TestLibCoreDateTime PRIVATE LibUnicode)
|
||||
|
|
|
|||
|
|
@ -16,5 +16,5 @@ set(TEST_SOURCES
|
|||
)
|
||||
|
||||
foreach(source IN LISTS TEST_SOURCES)
|
||||
serenity_test("${source}" LibCrypto LIBS LibCrypto)
|
||||
ladybird_test("${source}" LibCrypto LIBS LibCrypto)
|
||||
endforeach()
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ set(TEST_SOURCES
|
|||
)
|
||||
|
||||
foreach(source IN LISTS TEST_SOURCES)
|
||||
serenity_test("${source}" LibDNS LIBS LibDNS LibTLS)
|
||||
ladybird_test("${source}" LibDNS LIBS LibDNS LibTLS)
|
||||
endforeach()
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ set(TEST_SOURCES
|
|||
)
|
||||
|
||||
foreach(source IN LISTS TEST_SOURCES)
|
||||
serenity_test("${source}" LibDiff LIBS LibDiff)
|
||||
ladybird_test("${source}" LibDiff LIBS LibDiff)
|
||||
endforeach()
|
||||
|
|
|
|||
|
|
@ -16,5 +16,5 @@ if (NOT WIN32)
|
|||
endif()
|
||||
|
||||
foreach(source IN LISTS TEST_SOURCES)
|
||||
serenity_test("${source}" LibGfx LIBS LibGfx)
|
||||
ladybird_test("${source}" LibGfx LIBS LibGfx)
|
||||
endforeach()
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
serenity_test(test-invalid-unicode-js.cpp LibJS LIBS LibJS LibUnicode)
|
||||
serenity_test(test-value-js.cpp LibJS LIBS LibJS LibUnicode)
|
||||
ladybird_test(test-invalid-unicode-js.cpp LibJS LIBS LibJS LibUnicode)
|
||||
ladybird_test(test-value-js.cpp LibJS LIBS LibJS LibUnicode)
|
||||
|
||||
# FIXME: This test is currently not working in the windows-2025 GHA image due to the Visual Studio version currently being used
|
||||
if (WIN32 AND ENABLE_WINDOWS_CI)
|
||||
return()
|
||||
endif()
|
||||
|
||||
serenity_testjs_test(test-js.cpp test-js LIBS LibGC)
|
||||
ladybird_testjs_test(test-js.cpp test-js LIBS LibGC)
|
||||
set_tests_properties(test-js PROPERTIES ENVIRONMENT LADYBIRD_SOURCE_DIR=${SERENITY_PROJECT_ROOT})
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ set(TEST_SOURCES
|
|||
)
|
||||
|
||||
foreach(source IN LISTS TEST_SOURCES)
|
||||
serenity_test("${source}" LibRegex LIBS LibRegex)
|
||||
ladybird_test("${source}" LibRegex LIBS LibRegex)
|
||||
endforeach()
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ set(TEST_SOURCES
|
|||
)
|
||||
|
||||
foreach(source IN LISTS TEST_SOURCES)
|
||||
serenity_test("${source}" Test)
|
||||
ladybird_test("${source}" Test)
|
||||
endforeach()
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ set(TEST_SOURCES
|
|||
)
|
||||
|
||||
foreach(source IN LISTS TEST_SOURCES)
|
||||
serenity_test("${source}" LibTextCodec LIBS LibTextCodec)
|
||||
ladybird_test("${source}" LibTextCodec LIBS LibTextCodec)
|
||||
endforeach()
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ set(TEST_SOURCES
|
|||
)
|
||||
|
||||
foreach(source IN LISTS TEST_SOURCES)
|
||||
serenity_test("${source}" LibThreading LIBS LibThreading)
|
||||
ladybird_test("${source}" LibThreading LIBS LibThreading)
|
||||
endforeach()
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ set(URL_TEST_SOURCES
|
|||
)
|
||||
|
||||
foreach(source IN LISTS URL_TEST_SOURCES)
|
||||
serenity_test("${source}" LibURL LIBS LibURL)
|
||||
ladybird_test("${source}" LibURL LIBS LibURL)
|
||||
endforeach()
|
||||
|
|
|
|||
|
|
@ -9,5 +9,5 @@ set(TEST_SOURCES
|
|||
)
|
||||
|
||||
foreach(source IN LISTS TEST_SOURCES)
|
||||
serenity_test("${source}" LibUnicode LIBS LibUnicode)
|
||||
ladybird_test("${source}" LibUnicode LIBS LibUnicode)
|
||||
endforeach()
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ set(TEST_SOURCES
|
|||
)
|
||||
|
||||
foreach(source IN LISTS TEST_SOURCES)
|
||||
serenity_test("${source}" LibWeb LIBS LibWeb)
|
||||
ladybird_test("${source}" LibWeb LIBS LibWeb)
|
||||
endforeach()
|
||||
|
||||
target_link_libraries(TestFetchURL PRIVATE LibURL)
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ set(TEST_SOURCES
|
|||
)
|
||||
|
||||
foreach(source IN LISTS TEST_SOURCES)
|
||||
serenity_test("${source}" LibWebView LIBS LibWebView LibURL)
|
||||
ladybird_test("${source}" LibWebView LIBS LibWebView LibURL)
|
||||
endforeach()
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ set(TEST_SOURCES
|
|||
)
|
||||
|
||||
foreach(source IN LISTS TEST_SOURCES)
|
||||
serenity_test("${source}" LibXML LIBS LibXML)
|
||||
ladybird_test("${source}" LibXML LIBS LibXML)
|
||||
endforeach()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue