root
/
aseprite
mirror of https://github.com/aseprite/aseprite.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Update modules due cmake_minimum_required() issues (#5087, #5071)

This commit is contained in:
David Capello 2025-04-02 10:38:13 -03:00
parent 7167969963
commit bae8520580
8 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -243,7 +243,13 @@ if(USE_SHARED_LIBPNG)
add_definitions(${PNG_DEFINITIONS}) add_definitions(${PNG_DEFINITIONS})
else() else()
set(PNG_FOUND ON) set(PNG_FOUND ON)
# Skia on Linux includes libpng symbols
if(UNIX AND NOT APPLE AND LAF_BACKEND STREQUAL "skia")
set(PNG_LIBRARY skia)
else()
set(PNG_LIBRARY png_static) set(PNG_LIBRARY png_static)
endif()
set(PNG_LIBRARIES ${PNG_LIBRARY}) set(PNG_LIBRARIES ${PNG_LIBRARY})
set(PNG_INCLUDE_DIRS set(PNG_INCLUDE_DIRS
${LIBPNG_DIR} ${LIBPNG_DIR}

2
laf

@ -1 +1 @@
Subproject commit fdc9001cb0251a40092ebb9b2bca6e61fdf9f6f7 Subproject commit 221fe5eb36248c11535f6c05c9d906183ebb2b59

4
third_party/CMakeLists.txt vendored
View File

@ -1,5 +1,5 @@
# Aseprite # Aseprite
# Copyright (C) 2021-2024 Igara Studio S.A. # Copyright (C) 2021-2025 Igara Studio S.A.
# Copyright (C) 2001-2018 David Capello # Copyright (C) 2001-2018 David Capello
include_directories(.) include_directories(.)
@ -12,7 +12,9 @@ if(NOT USE_SHARED_ZLIB)
set(SKIP_INSTALL_ALL on) set(SKIP_INSTALL_ALL on)
# Don't build zlib tests # Don't build zlib tests
set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "Enable Zlib Examples") set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "Enable Zlib Examples")
set(ZLIB_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/zlib" CACHE INTERNAL "")
add_subdirectory(zlib) add_subdirectory(zlib)
add_library(ZLIB::ZLIB ALIAS zlibstatic)
endif() endif()
if(NOT USE_SHARED_LIBPNG) if(NOT USE_SHARED_LIBPNG)

2
third_party/TinyEXIF vendored

@ -1 +1 @@
Subproject commit 2283d8094e42e6b6cef00d1d31ecadfe0d9e1f29 Subproject commit 21d6cf762724260f8e5bcee4abdee5411ae47813

2
third_party/harfbuzz vendored

@ -1 +1 @@
Subproject commit 3412c32b35db911832c0b396894203899f8f5157 Subproject commit 8607be393dfd81614611897a6e3026fe94a3966c

2
third_party/json11 vendored

@ -1 +1 @@
Subproject commit f1ff45a7cd3781ab2d6bfaa8552a74172b5e6a73 Subproject commit f84540a0fd719b757f86c93c8bafd54fbe7f7031

2
third_party/libarchive vendored

@ -1 +1 @@
Subproject commit fb3d9be28cfd4551de949bb5b8c44b1d6e2aec9b Subproject commit 7bde8b8259921f2dcbb31a664ceb298b819d29dc

2
third_party/libpng vendored

@ -1 +1 @@
Subproject commit f135775ad4e5d4408d2e12ffcc71bb36e6b48551 Subproject commit 34005e3d3d373c0c36898cc55eae48a79c8238a1