From 543b415b7d716aa478c376687ee5218b0aedf258 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 2 Jul 2024 10:31:50 +0200 Subject: [PATCH] LibWeb: Allow using system skia unofficial-skia is a vcpkg-specific package. With this change ladybird can be built against skia as provided by system package managers such as guix, mingw, and (soon) nix. All those packages include a .pc file, so we use pkg-config. --- Userland/Libraries/LibWeb/CMakeLists.txt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt index 5b22c4ac91e..20d59f153c9 100644 --- a/Userland/Libraries/LibWeb/CMakeLists.txt +++ b/Userland/Libraries/LibWeb/CMakeLists.txt @@ -754,11 +754,19 @@ set(GENERATED_SOURCES Worker/WebWorkerServerEndpoint.h ) -find_package(unofficial-skia CONFIG REQUIRED) - serenity_lib(LibWeb web) -target_link_libraries(LibWeb PRIVATE LibCore LibCrypto LibJS LibHTTP LibGfx LibIPC LibRegex LibSyntax LibTextCodec LibUnicode LibAudio LibMedia LibWasm LibXML LibIDL LibURL LibTLS unofficial::skia::skia) +find_package(unofficial-skia CONFIG) +if(unofficial-skia_FOUND) + set(SKIA_LIBRARIES unofficial::skia::skia) +else() + find_package(PkgConfig) + pkg_check_modules(SKIA skia=124 REQUIRED) + target_include_directories(LibWeb PRIVATE ${SKIA_INCLUDE_DIRS}) + target_link_directories(LibWeb PRIVATE ${SKIA_LIBRARY_DIRS}) +endif() + +target_link_libraries(LibWeb PRIVATE LibCore LibCrypto LibJS LibHTTP LibGfx LibIPC LibRegex LibSyntax LibTextCodec LibUnicode LibAudio LibMedia LibWasm LibXML LibIDL LibURL LibTLS ${SKIA_LIBRARIES}) generate_js_bindings(LibWeb)