From 517742d6f92f4409fd97a371970abcc15909f38a Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Mon, 5 Dec 2022 10:43:17 -0500 Subject: [PATCH] LibSQL+SQLServer: Generate SQLServer's IPC sources with LibSQL on Lagom Exclude SQLServer from Lagom, and instead generate its IPC sources with LibSQL. --- Userland/Libraries/LibSQL/CMakeLists.txt | 15 +++++++++------ Userland/Services/CMakeLists.txt | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Userland/Libraries/LibSQL/CMakeLists.txt b/Userland/Libraries/LibSQL/CMakeLists.txt index aa92d3c0ae..febcb1c28d 100644 --- a/Userland/Libraries/LibSQL/CMakeLists.txt +++ b/Userland/Libraries/LibSQL/CMakeLists.txt @@ -24,18 +24,21 @@ set(SOURCES ResultSet.cpp Row.cpp Serializer.cpp + SQLClient.cpp TreeNode.cpp Tuple.cpp Value.cpp ) -if (SERENITYOS) - list(APPEND SOURCES SQLClient.cpp) - set(GENERATED_SOURCES - ../../Services/SQLServer/SQLClientEndpoint.h - ../../Services/SQLServer/SQLServerEndpoint.h - ) +if (NOT SERENITYOS) + compile_ipc(../../Services/SQLServer/SQLClient.ipc ../../Services/SQLServer/SQLClientEndpoint.h) + compile_ipc(../../Services/SQLServer/SQLServer.ipc ../../Services/SQLServer/SQLServerEndpoint.h) endif() +set(GENERATED_SOURCES + ../../Services/SQLServer/SQLClientEndpoint.h + ../../Services/SQLServer/SQLServerEndpoint.h +) + serenity_lib(LibSQL sql) target_link_libraries(LibSQL PRIVATE LibCore LibIPC LibSyntax LibRegex) diff --git a/Userland/Services/CMakeLists.txt b/Userland/Services/CMakeLists.txt index f617787235..5ff1aedff4 100644 --- a/Userland/Services/CMakeLists.txt +++ b/Userland/Services/CMakeLists.txt @@ -5,7 +5,6 @@ add_subdirectory(ImageDecoder) add_subdirectory(InspectorServer) add_subdirectory(LookupServer) add_subdirectory(RequestServer) -add_subdirectory(SQLServer) add_subdirectory(WebServer) add_subdirectory(WebSocket) @@ -22,6 +21,7 @@ if (SERENITYOS) add_subdirectory(NetworkServer) add_subdirectory(NotificationServer) add_subdirectory(SpiceAgent) + add_subdirectory(SQLServer) add_subdirectory(SystemServer) add_subdirectory(Taskbar) add_subdirectory(TelnetServer)