Get clipper2 to compile in flatpak version

This commit is contained in:
Yousef Khadadeh 2026-06-04 18:35:30 +03:00
parent 12bb936c16
commit dcc71be630
2 changed files with 21 additions and 2 deletions

View file

@ -206,8 +206,10 @@ if(NO_CONAN_BUILD)
find_package(Fontconfig REQUIRED)
find_package(PNG REQUIRED)
find_package(ZLIB REQUIRED)
find_package(Clipper2 REQUIRED)
else()
find_package(skia-infinipaint REQUIRED)
find_package(clipper2 REQUIRED)
endif()
if(NOT EMSCRIPTEN)
@ -230,7 +232,6 @@ if((NOT (GRAPHICS_BACKEND STREQUAL "Vulkan")) AND (NOT EMSCRIPTEN) AND LINUX AND
endif()
find_package(zstd REQUIRED)
find_package(clipper2 REQUIRED)
message("Skia root: " ${SKIA_INCLUDE})
message("Build type: " ${CMAKE_BUILD_TYPE})
@ -360,7 +361,13 @@ if((NOT EMSCRIPTEN) AND (NOT APPLE) AND (NOT ANDROID))
endif()
endif()
target_link_libraries(main zstd::libzstd_static Clipper2::clipper2)
target_link_libraries(main zstd::libzstd_static)
if(NO_CONAN_BUILD)
target_link_libraries(main zstd::libzstd_static Clipper2::Clipper2)
else()
target_link_libraries(main zstd::libzstd_static Clipper2::clipper2)
endif()
if((NOT EMSCRIPTEN) AND WIN32)
target_link_libraries(main dwrite)

View file

@ -80,6 +80,18 @@ modules:
- type: archive
url: https://github.com/google/skia/archive/da51f0d60ea2b14e845a823dc11b405dbeef42d8.zip
sha256: 1f5140d5908031d8cdd06429a633a1583b12fc43dc1c768374ed1e91ab9fa596
- name: Clipper2
buildsystem: cmake-ninja
config-opts:
- -DCLIPPER2_UTILS=OFF
- -DCLIPPER2_EXAMPLES=OFF
- -DCLIPPER2_TESTS=OFF
subdir: CPP
sources:
- type: git
tag: Clipper2_2.0.1
commit: 21ebba05db8894f0c7217ad35ea518080f324946
url: https://github.com/AngusJohnson/Clipper2.git
- name: infinipaint-x86_64
buildsystem: cmake-ninja
builddir: true