From 1878ed10d24399f3c3a75d6d9fae18d3feb44122 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Mon, 19 May 2025 10:21:14 -0600 Subject: [PATCH] CMake: Move Utilities build rules to Utilities directory --- Meta/Lagom/CMakeLists.txt | 32 +------------------------------- Utilities/CMakeLists.txt | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 31 deletions(-) create mode 100644 Utilities/CMakeLists.txt diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index 17b0f3118a9..34885189bb7 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -414,37 +414,7 @@ if (ENABLE_FUZZERS OR ENABLE_COMPILER_EXPLORER_BUILD OR ANDROID OR IOS) endif() # Lagom Utilities -lagom_utility(abench SOURCES ../../Utilities/abench.cpp LIBS LibMain LibFileSystem LibMedia) - -lagom_utility(dns SOURCES ../../Utilities/dns.cpp LIBS LibDNS LibMain LibTLS LibCrypto) - -if (ENABLE_GUI_TARGETS) - lagom_utility(animation SOURCES ../../Utilities/animation.cpp LIBS LibGfx LibMain) - lagom_utility(image SOURCES ../../Utilities/image.cpp LIBS LibGfx LibMain) -endif() - -lagom_utility(js SOURCES ../../Utilities/js.cpp LIBS LibCrypto LibJS LibLine LibUnicode LibMain LibTextCodec LibGC Threads::Threads) -lagom_utility(test262-runner SOURCES ../../Utilities/test262-runner.cpp LIBS LibJS LibFileSystem LibGC) - -if (CMAKE_SYSTEM_NAME STREQUAL "Linux") - include(CheckCSourceCompiles) - # Check for musl's declaration of __assert_fail - check_c_source_compiles( - " - #include - __attribute__((__noreturn__)) void __assert_fail(char const* assertion, char const* file, int line, char const* function) {} - int main() {} - " - ASSERT_FAIL_HAS_INT - ) -endif() - -if (ASSERT_FAIL_HAS_INT OR EMSCRIPTEN) - target_compile_definitions(test262-runner PRIVATE ASSERT_FAIL_HAS_INT) -endif() - -lagom_utility(wasm SOURCES ../../Utilities/wasm.cpp LIBS LibFileSystem LibWasm LibLine LibMain) -lagom_utility(xml SOURCES ../../Utilities/xml.cpp LIBS LibFileSystem LibMain LibXML LibURL) +add_serenity_subdirectory(Utilities) include(CTest) if (BUILD_TESTING) diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt new file mode 100644 index 00000000000..81a1de67887 --- /dev/null +++ b/Utilities/CMakeLists.txt @@ -0,0 +1,29 @@ +lagom_utility(abench SOURCES abench.cpp LIBS LibMain LibFileSystem LibMedia) +lagom_utility(dns SOURCES dns.cpp LIBS LibDNS LibMain LibTLS LibCrypto) + +if (ENABLE_GUI_TARGETS) + lagom_utility(animation SOURCES animation.cpp LIBS LibGfx LibMain) + lagom_utility(image SOURCES image.cpp LIBS LibGfx LibMain) +endif() + +lagom_utility(js SOURCES js.cpp LIBS LibCrypto LibJS LibLine LibUnicode LibMain LibTextCodec LibGC Threads::Threads) +lagom_utility(test262-runner SOURCES test262-runner.cpp LIBS LibJS LibFileSystem LibGC) + +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") + include(CheckCSourceCompiles) + # Check for musl's declaration of __assert_fail + check_c_source_compiles(" + #include + __attribute__((__noreturn__)) void __assert_fail(char const* assertion, char const* file, int line, char const* function) {} + int main() {} + " + ASSERT_FAIL_HAS_INT + ) +endif() + +if (ASSERT_FAIL_HAS_INT OR EMSCRIPTEN) + target_compile_definitions(test262-runner PRIVATE ASSERT_FAIL_HAS_INT) +endif() + +lagom_utility(wasm SOURCES wasm.cpp LIBS LibFileSystem LibWasm LibLine LibMain) +lagom_utility(xml SOURCES xml.cpp LIBS LibFileSystem LibMain LibXML LibURL)