diff --git a/AK/CMakeLists.txt b/AK/CMakeLists.txt index 09ab57c9d4a..d5de3292916 100644 --- a/AK/CMakeLists.txt +++ b/AK/CMakeLists.txt @@ -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) diff --git a/Libraries/LibCompress/CMakeLists.txt b/Libraries/LibCompress/CMakeLists.txt index d5fb08674b4..b3a48efb8ce 100644 --- a/Libraries/LibCompress/CMakeLists.txt +++ b/Libraries/LibCompress/CMakeLists.txt @@ -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) diff --git a/Libraries/LibCore/CMakeLists.txt b/Libraries/LibCore/CMakeLists.txt index 98137919f23..9fe447471e4 100644 --- a/Libraries/LibCore/CMakeLists.txt +++ b/Libraries/LibCore/CMakeLists.txt @@ -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) diff --git a/Libraries/LibCrypto/CMakeLists.txt b/Libraries/LibCrypto/CMakeLists.txt index 7a32ab1ddc7..97c29da486f 100644 --- a/Libraries/LibCrypto/CMakeLists.txt +++ b/Libraries/LibCrypto/CMakeLists.txt @@ -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) diff --git a/Libraries/LibDNS/CMakeLists.txt b/Libraries/LibDNS/CMakeLists.txt index 710b22c7fa8..63dc030dd4e 100644 --- a/Libraries/LibDNS/CMakeLists.txt +++ b/Libraries/LibDNS/CMakeLists.txt @@ -2,5 +2,5 @@ set(SOURCES Message.cpp ) -serenity_lib(LibDNS dns) +ladybird_lib(LibDNS dns) target_link_libraries(LibDNS PRIVATE LibCore PUBLIC LibCrypto) diff --git a/Libraries/LibDevTools/CMakeLists.txt b/Libraries/LibDevTools/CMakeLists.txt index e0151ea6570..e0fca22fe85 100644 --- a/Libraries/LibDevTools/CMakeLists.txt +++ b/Libraries/LibDevTools/CMakeLists.txt @@ -23,5 +23,5 @@ set(SOURCES DevToolsServer.cpp ) -serenity_lib(LibDevTools devtools) +ladybird_lib(LibDevTools devtools) target_link_libraries(LibDevTools PRIVATE LibCore LibWeb) diff --git a/Libraries/LibDiff/CMakeLists.txt b/Libraries/LibDiff/CMakeLists.txt index 82319cc0a36..d8cdea4f22e 100644 --- a/Libraries/LibDiff/CMakeLists.txt +++ b/Libraries/LibDiff/CMakeLists.txt @@ -3,4 +3,4 @@ set(SOURCES Generator.cpp ) -serenity_lib(LibDiff diff) +ladybird_lib(LibDiff diff) diff --git a/Libraries/LibFileSystem/CMakeLists.txt b/Libraries/LibFileSystem/CMakeLists.txt index 972e3499d65..07bda3dd270 100644 --- a/Libraries/LibFileSystem/CMakeLists.txt +++ b/Libraries/LibFileSystem/CMakeLists.txt @@ -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) diff --git a/Libraries/LibGC/CMakeLists.txt b/Libraries/LibGC/CMakeLists.txt index 37cb5d2c001..c89319960ad 100644 --- a/Libraries/LibGC/CMakeLists.txt +++ b/Libraries/LibGC/CMakeLists.txt @@ -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) diff --git a/Libraries/LibGfx/CMakeLists.txt b/Libraries/LibGfx/CMakeLists.txt index e888b4be5ef..f69ab9a096e 100644 --- a/Libraries/LibGfx/CMakeLists.txt +++ b/Libraries/LibGfx/CMakeLists.txt @@ -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) diff --git a/Libraries/LibHTTP/CMakeLists.txt b/Libraries/LibHTTP/CMakeLists.txt index d2750188162..172f4883076 100644 --- a/Libraries/LibHTTP/CMakeLists.txt +++ b/Libraries/LibHTTP/CMakeLists.txt @@ -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) diff --git a/Libraries/LibIDL/CMakeLists.txt b/Libraries/LibIDL/CMakeLists.txt index 4856e05f0f6..0d42d631480 100644 --- a/Libraries/LibIDL/CMakeLists.txt +++ b/Libraries/LibIDL/CMakeLists.txt @@ -4,5 +4,5 @@ set(SOURCES Types.cpp ) -serenity_lib(LibIDL idl) +ladybird_lib(LibIDL idl) target_link_libraries(LibIDL PRIVATE LibCoreMinimal LibFileSystem) diff --git a/Libraries/LibIPC/CMakeLists.txt b/Libraries/LibIPC/CMakeLists.txt index 9383718df87..74a934e7f62 100644 --- a/Libraries/LibIPC/CMakeLists.txt +++ b/Libraries/LibIPC/CMakeLists.txt @@ -16,5 +16,5 @@ else() TransportSocketWindows.cpp) endif() -serenity_lib(LibIPC ipc) +ladybird_lib(LibIPC ipc) target_link_libraries(LibIPC PRIVATE LibCore LibURL LibThreading) diff --git a/Libraries/LibImageDecoderClient/CMakeLists.txt b/Libraries/LibImageDecoderClient/CMakeLists.txt index b9af1b2b131..76fd1d8d90d 100644 --- a/Libraries/LibImageDecoderClient/CMakeLists.txt +++ b/Libraries/LibImageDecoderClient/CMakeLists.txt @@ -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) diff --git a/Libraries/LibJS/CMakeLists.txt b/Libraries/LibJS/CMakeLists.txt index e5a8abc81a7..d1b613e48f1 100644 --- a/Libraries/LibJS/CMakeLists.txt +++ b/Libraries/LibJS/CMakeLists.txt @@ -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. diff --git a/Libraries/LibLine/CMakeLists.txt b/Libraries/LibLine/CMakeLists.txt index b9bda963671..61a21635554 100644 --- a/Libraries/LibLine/CMakeLists.txt +++ b/Libraries/LibLine/CMakeLists.txt @@ -6,5 +6,5 @@ set(SOURCES XtermSuggestionDisplay.cpp ) -serenity_lib(LibLine line) +ladybird_lib(LibLine line) target_link_libraries(LibLine PRIVATE LibCore LibUnicode) diff --git a/Libraries/LibMain/CMakeLists.txt b/Libraries/LibMain/CMakeLists.txt index 3d470fd7c64..f8f8c365727 100644 --- a/Libraries/LibMain/CMakeLists.txt +++ b/Libraries/LibMain/CMakeLists.txt @@ -2,4 +2,4 @@ set(SOURCES Main.cpp ) -serenity_lib(LibMain main TYPE STATIC) +ladybird_lib(LibMain main TYPE STATIC) diff --git a/Libraries/LibMedia/CMakeLists.txt b/Libraries/LibMedia/CMakeLists.txt index c9623118639..00d4e12a1b8 100644 --- a/Libraries/LibMedia/CMakeLists.txt +++ b/Libraries/LibMedia/CMakeLists.txt @@ -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) diff --git a/Libraries/LibRegex/CMakeLists.txt b/Libraries/LibRegex/CMakeLists.txt index 05b0bb4ab3c..7a76f13bf73 100644 --- a/Libraries/LibRegex/CMakeLists.txt +++ b/Libraries/LibRegex/CMakeLists.txt @@ -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) diff --git a/Libraries/LibRequests/CMakeLists.txt b/Libraries/LibRequests/CMakeLists.txt index 8af8e17eb0f..927d94862fd 100644 --- a/Libraries/LibRequests/CMakeLists.txt +++ b/Libraries/LibRequests/CMakeLists.txt @@ -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) diff --git a/Libraries/LibSyntax/CMakeLists.txt b/Libraries/LibSyntax/CMakeLists.txt index 1ae97273c1f..eeca292bf9c 100644 --- a/Libraries/LibSyntax/CMakeLists.txt +++ b/Libraries/LibSyntax/CMakeLists.txt @@ -4,4 +4,4 @@ set(SOURCES Language.cpp ) -serenity_lib(LibSyntax syntax) +ladybird_lib(LibSyntax syntax) diff --git a/Libraries/LibTLS/CMakeLists.txt b/Libraries/LibTLS/CMakeLists.txt index 42099894b66..9cdeb000ab5 100644 --- a/Libraries/LibTLS/CMakeLists.txt +++ b/Libraries/LibTLS/CMakeLists.txt @@ -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) diff --git a/Libraries/LibTextCodec/CMakeLists.txt b/Libraries/LibTextCodec/CMakeLists.txt index 6fb8fda0d6f..5c08221d131 100644 --- a/Libraries/LibTextCodec/CMakeLists.txt +++ b/Libraries/LibTextCodec/CMakeLists.txt @@ -11,4 +11,4 @@ set(GENERATED_SOURCES LookupTables.cpp ) -serenity_lib(LibTextCodec textcodec) +ladybird_lib(LibTextCodec textcodec) diff --git a/Libraries/LibThreading/CMakeLists.txt b/Libraries/LibThreading/CMakeLists.txt index 8b717607802..4a07bec53ea 100644 --- a/Libraries/LibThreading/CMakeLists.txt +++ b/Libraries/LibThreading/CMakeLists.txt @@ -3,7 +3,7 @@ set(SOURCES Thread.cpp ) -serenity_lib(LibThreading threading) +ladybird_lib(LibThreading threading) target_link_libraries(LibThreading PRIVATE LibCore) if (WIN32) diff --git a/Libraries/LibURL/CMakeLists.txt b/Libraries/LibURL/CMakeLists.txt index 09b4b0f5f4d..46d758e0a0f 100644 --- a/Libraries/LibURL/CMakeLists.txt +++ b/Libraries/LibURL/CMakeLists.txt @@ -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) diff --git a/Libraries/LibUnicode/CMakeLists.txt b/Libraries/LibUnicode/CMakeLists.txt index 754dcf37577..c791ecdb720 100644 --- a/Libraries/LibUnicode/CMakeLists.txt +++ b/Libraries/LibUnicode/CMakeLists.txt @@ -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) diff --git a/Libraries/LibWasm/CMakeLists.txt b/Libraries/LibWasm/CMakeLists.txt index 478cc5cd56b..718de7d1304 100644 --- a/Libraries/LibWasm/CMakeLists.txt +++ b/Libraries/LibWasm/CMakeLists.txt @@ -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) diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt index d8de17201a8..59b7401986e 100644 --- a/Libraries/LibWeb/CMakeLists.txt +++ b/Libraries/LibWeb/CMakeLists.txt @@ -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) diff --git a/Libraries/LibWebSocket/CMakeLists.txt b/Libraries/LibWebSocket/CMakeLists.txt index 5a1846360db..357c4be0923 100644 --- a/Libraries/LibWebSocket/CMakeLists.txt +++ b/Libraries/LibWebSocket/CMakeLists.txt @@ -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) diff --git a/Libraries/LibWebView/CMakeLists.txt b/Libraries/LibWebView/CMakeLists.txt index e703d81d41c..8743df7fbbd 100644 --- a/Libraries/LibWebView/CMakeLists.txt +++ b/Libraries/LibWebView/CMakeLists.txt @@ -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) diff --git a/Libraries/LibXML/CMakeLists.txt b/Libraries/LibXML/CMakeLists.txt index a13ad641d65..53c6903d718 100644 --- a/Libraries/LibXML/CMakeLists.txt +++ b/Libraries/LibXML/CMakeLists.txt @@ -3,4 +3,4 @@ set(SOURCES DOM/Node.cpp ) -serenity_lib(LibXML xml) +ladybird_lib(LibXML xml) diff --git a/Meta/CMake/common_options.cmake b/Meta/CMake/common_options.cmake index b4a05861528..e9146f12eb8 100644 --- a/Meta/CMake/common_options.cmake +++ b/Meta/CMake/common_options.cmake @@ -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 diff --git a/Meta/CMake/lagom_options.cmake b/Meta/CMake/lagom_options.cmake index c348a7d8596..cd4a0e15bf5 100644 --- a/Meta/CMake/lagom_options.cmake +++ b/Meta/CMake/lagom_options.cmake @@ -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() diff --git a/Meta/CMake/targets.cmake b/Meta/CMake/targets.cmake index c47275e1f98..bc1cad78ea8 100644 --- a/Meta/CMake/targets.cmake +++ b/Meta/CMake/targets.cmake @@ -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() diff --git a/Meta/CMake/utils.cmake b/Meta/CMake/utils.cmake index 7c61f82689f..4ec2ed7532a 100644 --- a/Meta/CMake/utils.cmake +++ b/Meta/CMake/utils.cmake @@ -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 "$") 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() diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index 75ebcd721e6..36651b94cb5 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -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() diff --git a/Tests/AK/CMakeLists.txt b/Tests/AK/CMakeLists.txt index 5aaff4bab7e..ee87ac85819 100644 --- a/Tests/AK/CMakeLists.txt +++ b/Tests/AK/CMakeLists.txt @@ -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() diff --git a/Tests/LibCompress/CMakeLists.txt b/Tests/LibCompress/CMakeLists.txt index aec1cadddef..258f185eb5b 100644 --- a/Tests/LibCompress/CMakeLists.txt +++ b/Tests/LibCompress/CMakeLists.txt @@ -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() diff --git a/Tests/LibCore/CMakeLists.txt b/Tests/LibCore/CMakeLists.txt index b379612f008..274b6324192 100644 --- a/Tests/LibCore/CMakeLists.txt +++ b/Tests/LibCore/CMakeLists.txt @@ -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) diff --git a/Tests/LibCrypto/CMakeLists.txt b/Tests/LibCrypto/CMakeLists.txt index d9cab3629d3..3baafe3a882 100644 --- a/Tests/LibCrypto/CMakeLists.txt +++ b/Tests/LibCrypto/CMakeLists.txt @@ -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() diff --git a/Tests/LibDNS/CMakeLists.txt b/Tests/LibDNS/CMakeLists.txt index f9b0b64735e..4c2f770aed0 100644 --- a/Tests/LibDNS/CMakeLists.txt +++ b/Tests/LibDNS/CMakeLists.txt @@ -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() diff --git a/Tests/LibDiff/CMakeLists.txt b/Tests/LibDiff/CMakeLists.txt index d1b7cdb562a..11df7c693de 100644 --- a/Tests/LibDiff/CMakeLists.txt +++ b/Tests/LibDiff/CMakeLists.txt @@ -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() diff --git a/Tests/LibGfx/CMakeLists.txt b/Tests/LibGfx/CMakeLists.txt index fd9adf283a1..dc707ebf831 100644 --- a/Tests/LibGfx/CMakeLists.txt +++ b/Tests/LibGfx/CMakeLists.txt @@ -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() diff --git a/Tests/LibJS/CMakeLists.txt b/Tests/LibJS/CMakeLists.txt index 714378830e6..f0e36a801fa 100644 --- a/Tests/LibJS/CMakeLists.txt +++ b/Tests/LibJS/CMakeLists.txt @@ -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}) diff --git a/Tests/LibRegex/CMakeLists.txt b/Tests/LibRegex/CMakeLists.txt index cfccc90d8ad..56ee27366bb 100644 --- a/Tests/LibRegex/CMakeLists.txt +++ b/Tests/LibRegex/CMakeLists.txt @@ -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() diff --git a/Tests/LibTest/CMakeLists.txt b/Tests/LibTest/CMakeLists.txt index 2c57325b858..19a42d1af05 100644 --- a/Tests/LibTest/CMakeLists.txt +++ b/Tests/LibTest/CMakeLists.txt @@ -4,5 +4,5 @@ set(TEST_SOURCES ) foreach(source IN LISTS TEST_SOURCES) - serenity_test("${source}" Test) + ladybird_test("${source}" Test) endforeach() diff --git a/Tests/LibTextCodec/CMakeLists.txt b/Tests/LibTextCodec/CMakeLists.txt index 9cfade466c6..8b8356e32a7 100644 --- a/Tests/LibTextCodec/CMakeLists.txt +++ b/Tests/LibTextCodec/CMakeLists.txt @@ -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() diff --git a/Tests/LibThreading/CMakeLists.txt b/Tests/LibThreading/CMakeLists.txt index 5f4914ab4fd..efd7b60f197 100644 --- a/Tests/LibThreading/CMakeLists.txt +++ b/Tests/LibThreading/CMakeLists.txt @@ -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() diff --git a/Tests/LibURL/CMakeLists.txt b/Tests/LibURL/CMakeLists.txt index 48069b1cee3..3fc65de05a3 100644 --- a/Tests/LibURL/CMakeLists.txt +++ b/Tests/LibURL/CMakeLists.txt @@ -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() diff --git a/Tests/LibUnicode/CMakeLists.txt b/Tests/LibUnicode/CMakeLists.txt index ec38a11dc5e..fdd59731816 100644 --- a/Tests/LibUnicode/CMakeLists.txt +++ b/Tests/LibUnicode/CMakeLists.txt @@ -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() diff --git a/Tests/LibWeb/CMakeLists.txt b/Tests/LibWeb/CMakeLists.txt index 4330b0632bd..521ac1d7236 100644 --- a/Tests/LibWeb/CMakeLists.txt +++ b/Tests/LibWeb/CMakeLists.txt @@ -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) diff --git a/Tests/LibWebView/CMakeLists.txt b/Tests/LibWebView/CMakeLists.txt index 86aea611a07..e9854fbbb9f 100644 --- a/Tests/LibWebView/CMakeLists.txt +++ b/Tests/LibWebView/CMakeLists.txt @@ -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() diff --git a/Tests/LibXML/CMakeLists.txt b/Tests/LibXML/CMakeLists.txt index 107f39bc115..511bc45e3ed 100644 --- a/Tests/LibXML/CMakeLists.txt +++ b/Tests/LibXML/CMakeLists.txt @@ -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()