WebDriver: Move all WebDriver configuration to Services

Author: https://github.com/trflynn89
Commit: 19fb790dc6
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/2251

CMakeLists.txt

@@ -89,6 +89,7 @@ endif()
 include(CTest) # for BUILD_TESTING option, default ON
 
 if (ENABLE_GUI_TARGETS)
+    add_subdirectory(Userland/Services)
     add_subdirectory(Ladybird)
 endif()
 

Ladybird/CMakeLists.txt

@@ -135,7 +135,6 @@ add_subdirectory(Headless)
 add_subdirectory(ImageDecoder)
 add_subdirectory(RequestServer)
 add_subdirectory(WebContent)
-add_subdirectory(WebDriver)
 add_subdirectory(WebWorker)
 
 set(ladybird_helper_processes ImageDecoder RequestServer WebContent WebWorker)

Userland/Services/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(WebDriver)

Userland/Services/WebDriver/CMakeLists.txt

@@ -1,18 +1,16 @@
-set(WEBDRIVER_SOURCE_DIR ${LADYBIRD_SOURCE_DIR}/Userland/Services/WebDriver)
-
 set(SOURCES
-    ${WEBDRIVER_SOURCE_DIR}/Client.cpp
+    ${LADYBIRD_SOURCE_DIR}/Ladybird/Utilities.cpp
-    ${WEBDRIVER_SOURCE_DIR}/Session.cpp
+    Client.cpp
-    ${WEBDRIVER_SOURCE_DIR}/WebContentConnection.cpp
+    Session.cpp
-    ../Utilities.cpp
+    WebContentConnection.cpp
     main.cpp
 )
 
 add_executable(WebDriver ${SOURCES})
 
-target_include_directories(WebDriver PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
+target_include_directories(WebDriver PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../..)
-target_include_directories(WebDriver PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/..)
+target_include_directories(WebDriver PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../..)
 target_include_directories(WebDriver PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland)
 target_include_directories(WebDriver PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland/Services)
+
 target_link_libraries(WebDriver PRIVATE LibCore LibFileSystem LibGfx LibIPC LibJS LibMain LibWeb LibWebSocket LibWebView)
-add_dependencies(WebDriver headless-browser)

Userland/Services/WebDriver/main.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Tim Flynn <trflynn89@serenityos.org>
+ * Copyright (c) 2022-2024, Tim Flynn <trflynn89@laybird.org>
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */