From 096ddb0021152cb2eb839bf8c1efa3bc00b221c4 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Wed, 6 Mar 2024 17:10:16 -0700 Subject: [PATCH] Ladybird: Include Userland/ in for Applications that use LibWeb After ea682207d099654dd0c5d1ed399e2060c4de1533, we need Userland/ included directly in these application executables. This only impacts the build with Ladybird/CMakeLists.txt as the top level CMakeLists, as the Lagom/ directory includes Userland/ globally. --- Ladybird/CMakeLists.txt | 1 + Ladybird/WebContent/CMakeLists.txt | 2 ++ Ladybird/WebWorker/CMakeLists.txt | 2 ++ 3 files changed, 5 insertions(+) diff --git a/Ladybird/CMakeLists.txt b/Ladybird/CMakeLists.txt index 8cf7181df0..23def84cfc 100644 --- a/Ladybird/CMakeLists.txt +++ b/Ladybird/CMakeLists.txt @@ -204,6 +204,7 @@ add_executable(headless-browser Utilities.cpp) target_include_directories(headless-browser PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(headless-browser PRIVATE ${SERENITY_SOURCE_DIR}/Userland/) target_link_libraries(headless-browser PRIVATE AK LibCore LibWeb LibWebView LibWebSocket LibCrypto LibFileSystem LibGemini LibHTTP LibImageDecoderClient LibJS LibGfx LibMain LibTLS LibIPC LibDiff LibProtocol) if (ANDROID) diff --git a/Ladybird/WebContent/CMakeLists.txt b/Ladybird/WebContent/CMakeLists.txt index d9316e389b..6f7e9accbb 100644 --- a/Ladybird/WebContent/CMakeLists.txt +++ b/Ladybird/WebContent/CMakeLists.txt @@ -46,6 +46,7 @@ else() endif() add_library(webcontent ${LIB_TYPE} ${WEBCONTENT_SOURCES}) target_include_directories(webcontent PRIVATE ${SERENITY_SOURCE_DIR}/Userland/Services/) + target_include_directories(webcontent PRIVATE ${SERENITY_SOURCE_DIR}/Userland/) target_include_directories(webcontent PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/..) target_link_libraries(webcontent PRIVATE LibAudio LibCore LibFileSystem LibGfx LibIPC LibJS LibMain LibWeb LibWebSocket LibProtocol LibWebView LibImageDecoderClient) target_sources(webcontent PUBLIC FILE_SET ladybird TYPE HEADERS @@ -78,6 +79,7 @@ else() endif() target_include_directories(WebContent PRIVATE ${SERENITY_SOURCE_DIR}/Userland/Services/) +target_include_directories(WebContent PRIVATE ${SERENITY_SOURCE_DIR}/Userland/) target_include_directories(WebContent PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/..) target_link_libraries(WebContent PRIVATE LibAudio LibCore LibFileSystem LibGfx LibImageDecoderClient LibIPC LibJS LibMain LibWeb LibWebSocket LibProtocol LibWebView) diff --git a/Ladybird/WebWorker/CMakeLists.txt b/Ladybird/WebWorker/CMakeLists.txt index 8b79581f3e..dd435fbf9b 100644 --- a/Ladybird/WebWorker/CMakeLists.txt +++ b/Ladybird/WebWorker/CMakeLists.txt @@ -17,8 +17,10 @@ set(WEBWORKER_SOURCES add_library(webworker STATIC ${WEBWORKER_SOURCES}) target_include_directories(webworker PRIVATE ${SERENITY_SOURCE_DIR}/Userland/Services/) +target_include_directories(webworker PRIVATE ${SERENITY_SOURCE_DIR}/Userland/) target_include_directories(webworker PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/..) target_link_libraries(webworker PUBLIC LibCore LibFileSystem LibGfx LibIPC LibJS LibProtocol LibWeb LibWebView LibLocale LibImageDecoderClient LibMain) add_executable(WebWorker main.cpp) +target_include_directories(WebWorker PRIVATE ${SERENITY_SOURCE_DIR}/Userland/) target_link_libraries(WebWorker PRIVATE webworker)