From b5b69a3ba61f90953e6edbe0ae5a79cac99b1c8a Mon Sep 17 00:00:00 2001
From: Undefine <undefine@undefine.pl>
Date: Fri, 27 Mar 2026 23:19:12 +0100
Subject: [PATCH] Meta: Move library subdirectory inclusion to the Libraries
 CMakeLists

It makes more sense to put all the specific libraries there instead
of putting some there and some in the top level CMakeLists.
---
 CMakeLists.txt           | 24 +-----------------------
 Libraries/CMakeLists.txt | 13 +++++++++++++
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19d74eacdb..57a5146e32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -174,28 +174,8 @@ add_library(NoCoverage INTERFACE)
 # "install" these special targets to placate CMake
 install(TARGETS NoCoverage EXPORT LagomTargets)
 
-# AK
 add_subdirectory(AK)
-
-# LibCore dependencies
-add_subdirectory(Libraries/LibTextCodec)
-add_subdirectory(Libraries/LibUnicode)
-add_subdirectory(Libraries/LibRegex)
-add_subdirectory(Libraries/LibURL)
-
-# LibCore
-add_subdirectory(Libraries/LibCore)
-
-# LibMain
-add_subdirectory(Libraries/LibMain)
-
-# LibFileSystem
-# This is needed even if Lagom is not enabled because it is depended upon by code generators.
-add_subdirectory(Libraries/LibFileSystem)
-
-# LibIDL
-# This is used by the BindingsGenerator so needs to always be built.
-add_subdirectory(Libraries/LibIDL)
+add_subdirectory(Libraries)
 
 # Code Generators and other host tools
 if (BUILD_LAGOM_TOOLS)
@@ -218,8 +198,6 @@ compile_ipc(${LADYBIRD_SOURCE_DIR}/Services/WebContent/WebDriverServer.ipc Servi
 compile_ipc(${LADYBIRD_SOURCE_DIR}/Services/WebContent/WebUIClient.ipc Services/WebContent/WebUIClientEndpoint.h)
 compile_ipc(${LADYBIRD_SOURCE_DIR}/Services/WebContent/WebUIServer.ipc Services/WebContent/WebUIServerEndpoint.h)
 
-add_subdirectory(Libraries)
-
 if (ENABLE_FUZZERS)
     add_subdirectory(Meta/Lagom/Fuzzers)
 endif()
diff --git a/Libraries/CMakeLists.txt b/Libraries/CMakeLists.txt
index dd9e9760f3..bf7232de0a 100644
--- a/Libraries/CMakeLists.txt
+++ b/Libraries/CMakeLists.txt
@@ -1,3 +1,16 @@
+add_subdirectory(LibCore)
+add_subdirectory(LibFileSystem)
+add_subdirectory(LibIDL)
+add_subdirectory(LibMain)
+add_subdirectory(LibRegex)
+add_subdirectory(LibTextCodec)
+add_subdirectory(LibUnicode)
+add_subdirectory(LibURL)
+
+if (LAGOM_TOOLS_ONLY)
+    return()
+endif()
+
 add_subdirectory(LibCompress)
 add_subdirectory(LibCrypto)
 add_subdirectory(LibDatabase)