Skip to content

Update sdl3 image config #684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
madebr merged 3 commits into from
Jan 23, 2026
+26 −10
Merged

Update sdl3 image config #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24654ea
cmake: fix indentations
madebr Jan 23, 2026
8dad8d0
cmake: define SDLIMAGE_PNG_LIBPNG in SDL3_imageConfig.cmake
madebr Jan 23, 2026
87dec9c
cmake: update variables in SDL3_imageConfig.cmake of release artifacts
madebr Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ jobs:
echo "mount-point=${mount_point}">>$GITHUB_OUTPUT
- name: 'Verify presence of optional frameworks'
run: |
OPTIONAL_FRAMEWORKS="avif jxl webp"
OPTIONAL_FRAMEWORKS="avif jxl png webp"
rc=0
for opt in $OPTIONAL_FRAMEWORKS; do
fw_path="${{ steps.mount.outputs.mount-point }}/optional/${opt}.xcframework"
Expand Down
12 changes: 6 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,8 +780,8 @@ if(SDLIMAGE_JXL)
add_library(libjxl::libjxl ALIAS ${jxl_lib})
endif()
elseif(SDLIMAGE_JXL_SHARED AND DEFINED SDLIMAGE_DYNAMIC_JXL AND EXISTS "${SDLIMAGE_DYNAMIC_JXL}")
message(STATUS "${PROJECT_NAME}: Using libjxl from CMake variable")
set(SDLIMAGE_JXL_ENABLED TRUE)
message(STATUS "${PROJECT_NAME}: Using libjxl from CMake variable")
set(SDLIMAGE_JXL_ENABLED TRUE)
else()
find_package(libjxl ${required})
if(libjxl_FOUND)
Expand All @@ -808,9 +808,9 @@ if(SDLIMAGE_JXL)
add_dependencies(${sdl3_image_target_name} libjxl::libjxl)
endif()
endif()
target_get_dynamic_library(SDLIMAGE_DYNAMIC_JXL libjxl::libjxl)
message(STATUS "Dynamic libjxl: ${SDLIMAGE_DYNAMIC_JXL}")
target_compile_definitions(${sdl3_image_target_name} PRIVATE "LOAD_JXL_DYNAMIC=\"${SDLIMAGE_DYNAMIC_JXL}\"")
target_get_dynamic_library(SDLIMAGE_DYNAMIC_JXL libjxl::libjxl)
message(STATUS "Dynamic libjxl: ${SDLIMAGE_DYNAMIC_JXL}")
target_compile_definitions(${sdl3_image_target_name} PRIVATE "LOAD_JXL_DYNAMIC=\"${SDLIMAGE_DYNAMIC_JXL}\"")
else()
target_link_libraries(${sdl3_image_target_name} PRIVATE libjxl::libjxl)
endif()
Expand Down Expand Up @@ -900,7 +900,7 @@ if(SDLIMAGE_PNG)
$<TARGET_PROPERTY:PNG::PNG,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
)
if(SDLIMAGE_PNG_VENDORED)
add_dependencies(${sdl3_image_target_name} PNG::PNG)
add_dependencies(${sdl3_image_target_name} PNG::PNG)
endif()
endif()
target_get_dynamic_library(SDLIMAGE_DYNAMIC_PNG PNG::PNG)
Expand Down
9 changes: 8 additions & 1 deletion Xcode/pkg-support/resources/CMake/SDL3_imageConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,17 @@ set(SDLIMAGE_XPM TRUE)
set(SDLIMAGE_XV TRUE)
set(SDLIMAGE_WEBP TRUE)

set(SDLIMAGE_PNG_LIBPNG TRUE)

set(SDLIMAGE_AVIF_SHARED TRUE)
set(SDLIMAGE_JXL_SHARED TRUE)
set(SDLIMAGE_PNG_SHARED TRUE)
set(SDLIMAGE_WEBP_SHARED TRUE)

set(SDLIMAGE_JPG_SAVE TRUE)
set(SDLIMAGE_PNG_SAVE TRUE)

set(SDLIMAGE_VENDORED FALSE)
set(SDLIMAGE_VENDORED TRUE)

set(SDLIMAGE_BACKEND_IMAGEIO TRUE)
set(SDLIMAGE_BACKEND_STB FALSE)
Expand Down
9 changes: 8 additions & 1 deletion build-scripts/pkg-support/msvc/cmake/SDL3_imageConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,17 @@ set(SDLIMAGE_XPM TRUE)
set(SDLIMAGE_XV TRUE)
set(SDLIMAGE_WEBP TRUE)

set(SDLIMAGE_PNG_LIBPNG TRUE)

set(SDLIMAGE_AVIF_SHARED TRUE)
set(SDLIMAGE_JXL_SHARED TRUE)
set(SDLIMAGE_PNG_SHARED TRUE)
set(SDLIMAGE_WEBP_SHARED TRUE)

set(SDLIMAGE_JPG_SAVE FALSE)
set(SDLIMAGE_PNG_SAVE FALSE)

set(SDLIMAGE_VENDORED FALSE)
set(SDLIMAGE_VENDORED TRUE)

set(SDLIMAGE_BACKEND_IMAGEIO FALSE)
set(SDLIMAGE_BACKEND_STB TRUE)
Expand Down
4 changes: 3 additions & 1 deletion cmake/SDL3_imageConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ set(SDLIMAGE_WEBP_SHARED @SDLIMAGE_WEBP_SHARED@)
set(SDLIMAGE_JPG_SAVE @SDLIMAGE_JPG_SAVE@)
set(SDLIMAGE_PNG_SAVE @SDLIMAGE_PNG_SAVE@)

set(SDLIMAGE_PNG_LIBPNG @SDLIMAGE_PNG_LIBPNG@)

set(SDLIMAGE_VENDORED @SDLIMAGE_VENDORED@)

set(SDLIMAGE_BACKEND_IMAGEIO @SDLIMAGE_BACKEND_IMAGEIO@)
Expand Down Expand Up @@ -101,7 +103,7 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL3_image-static-targets.cmake")
find_dependency(libjxl)
endif()

if(SDLIMAGE_PNG AND NOT TARGET PNG::PNG AND NOT SDLIMAGE_PNG_SHARED AND NOT (SDLIMAGE_BACKEND_STB OR SDLIMAGE_BACKEND_WIC OR SDLIMAGE_BACKEND_IMAGEIO))
if(SDLIMAGE_PNG AND SDLIMAGE_PNG_LIBPNG AND NOT TARGET PNG::PNG AND NOT SDLIMAGE_PNG_SHARED)
find_dependency(PNG)
endif()

Expand Down