mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-07-29 04:09:13 +00:00
RequestServer: Remove CMake dependency on LibWebView
Some checks are pending
CI / macOS, arm64, Sanitizer_CI, Clang (push) Waiting to run
CI / Linux, x86_64, Fuzzers_CI, Clang (push) Waiting to run
CI / Linux, x86_64, Sanitizer_CI, GNU (push) Waiting to run
CI / Linux, x86_64, Sanitizer_CI, Clang (push) Waiting to run
Package the js repl as a binary artifact / Linux, arm64 (push) Waiting to run
Package the js repl as a binary artifact / macOS, arm64 (push) Waiting to run
Package the js repl as a binary artifact / Linux, x86_64 (push) Waiting to run
Run test262 and test-wasm / run_and_update_results (push) Waiting to run
Lint Code / lint (push) Waiting to run
Label PRs with merge conflicts / auto-labeler (push) Waiting to run
Push notes / build (push) Waiting to run
Some checks are pending
CI / macOS, arm64, Sanitizer_CI, Clang (push) Waiting to run
CI / Linux, x86_64, Fuzzers_CI, Clang (push) Waiting to run
CI / Linux, x86_64, Sanitizer_CI, GNU (push) Waiting to run
CI / Linux, x86_64, Sanitizer_CI, Clang (push) Waiting to run
Package the js repl as a binary artifact / Linux, arm64 (push) Waiting to run
Package the js repl as a binary artifact / macOS, arm64 (push) Waiting to run
Package the js repl as a binary artifact / Linux, x86_64 (push) Waiting to run
Run test262 and test-wasm / run_and_update_results (push) Waiting to run
Lint Code / lint (push) Waiting to run
Label PRs with merge conflicts / auto-labeler (push) Waiting to run
Push notes / build (push) Waiting to run
We really don't need to link LibWebView and all its deps into RS. Fix up the CMake to properly depend on the generated IPC files instead.
This commit is contained in:
parent
1a6b4aaa49
commit
6785a01c6e
Notes:
github-actions[bot]
2025-07-07 07:11:18 +00:00
Author: https://github.com/ADKaster
Commit: 6785a01c6e
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/5326
Reviewed-by: https://github.com/alimpfard
Reviewed-by: https://github.com/gmta ✅
1 changed files with 11 additions and 5 deletions
|
@ -7,16 +7,22 @@ set(SOURCES
|
|||
WebSocketImplCurl.cpp
|
||||
)
|
||||
|
||||
set(GENERATED_SOURCES
|
||||
RequestClientEndpoint.h
|
||||
RequestServerEndpoint.h
|
||||
)
|
||||
|
||||
set(RS_LIB_TYPE STATIC)
|
||||
if (ANDROID)
|
||||
add_library(requestserverservice SHARED
|
||||
list(APPEND SOURCES
|
||||
${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/RequestServerService.cpp
|
||||
${LADYBIRD_SOURCE_DIR}/UI/Android/src/main/cpp/LadybirdServiceBaseJNI.cpp
|
||||
${SOURCES}
|
||||
)
|
||||
else()
|
||||
add_library(requestserverservice STATIC ${SOURCES})
|
||||
set(RS_LIB_TYPE SHARED)
|
||||
endif()
|
||||
|
||||
ladybird_lib(requestserverservice TYPE ${RS_LIB_TYPE})
|
||||
|
||||
find_package(PkgConfig)
|
||||
find_package(CURL REQUIRED)
|
||||
|
||||
|
@ -26,7 +32,7 @@ target_include_directories(requestserverservice PRIVATE ${CMAKE_CURRENT_BINARY_D
|
|||
target_include_directories(requestserverservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Services/)
|
||||
|
||||
target_link_libraries(RequestServer PRIVATE requestserverservice)
|
||||
target_link_libraries(requestserverservice PUBLIC LibCore LibDNS LibMain LibCrypto LibFileSystem LibIPC LibMain LibTLS LibWebView LibWebSocket LibURL LibTextCodec LibThreading CURL::libcurl)
|
||||
target_link_libraries(requestserverservice PUBLIC LibCore LibDNS LibMain LibCrypto LibFileSystem LibIPC LibMain LibTLS LibWebSocket LibURL LibTextCodec LibThreading CURL::libcurl)
|
||||
target_link_libraries(requestserverservice PRIVATE OpenSSL::Crypto OpenSSL::SSL)
|
||||
|
||||
if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue