mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update png library (formatting, CMake)

Browse Source 
This is a minor tweak.
This commit is contained in:
Albrecht Schlosser 2023-12-05 20:28:31 +01:00
parent 6bd3e83b00
commit 3846f23d41
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
png/CMakeLists.txt
View File

@ -15,7 +15,7 @@
# #
# source files for png # source files for png
set(PNG_SRCS set (PNG_SRCS
png.c png.c
pngerror.c pngerror.c
pngget.c pngget.c
@ -34,9 +34,10 @@ set(PNG_SRCS
) )
####################################################################### #######################################################################
# Note: This file is only used if we build the bundled PNG library and # Note: This file is used only if we build the bundled PNG library,
# if we do this we MUST also build and use the bundled ZLIB, hence # and if we do this we MUST also build and use the *bundled* ZLIB,
# we MUST also link to the bundled ZLIB (see below). # hence we MUST also link against the bundled ZLIB (see below).
# There's no need to check which ZLIB version to use in this context.
####################################################################### #######################################################################
####################################################################### #######################################################################
@ -49,16 +50,16 @@ set(PNG_SRCS
# This includes all non-macOS platforms. # This includes all non-macOS platforms.
if (CMAKE_OSX_ARCHITECTURES) if (CMAKE_OSX_ARCHITECTURES)
string(REGEX MATCH "arm64" is_arm "${CMAKE_OSX_ARCHITECTURES}") string (REGEX MATCH "arm64" is_arm "${CMAKE_OSX_ARCHITECTURES}")
else () else ()
set (is_arm TRUE) set (is_arm TRUE)
endif () endif ()
if (is_arm) if (is_arm)
LIST (APPEND PNG_SRCS LIST (APPEND PNG_SRCS
arm/arm_init.c arm/arm_init.c
arm/filter_neon_intrinsics.c arm/filter_neon_intrinsics.c
arm/palette_neon_intrinsics.c arm/palette_neon_intrinsics.c
) )
endif () endif ()
@ -71,8 +72,8 @@ unset (is_arm)
####################################################################### #######################################################################
LIST (APPEND PNG_SRCS LIST (APPEND PNG_SRCS
powerpc/powerpc_init.c powerpc/powerpc_init.c
powerpc/filter_vsx_intrinsics.c powerpc/filter_vsx_intrinsics.c
) )
####################################################################### #######################################################################
@ -80,7 +81,7 @@ LIST (APPEND PNG_SRCS
####################################################################### #######################################################################
FL_ADD_LIBRARY (fltk_png STATIC "${PNG_SRCS}") FL_ADD_LIBRARY (fltk_png STATIC "${PNG_SRCS}")
target_link_libraries(fltk_png PUBLIC fltk_z) target_link_libraries (fltk_png PUBLIC fltk_z)
####################################################################### #######################################################################
# Build the shared library (optional) # Build the shared library (optional)
@ -89,7 +90,7 @@ target_link_libraries(fltk_png PUBLIC fltk_z)
if (OPTION_BUILD_SHARED_LIBS) if (OPTION_BUILD_SHARED_LIBS)
FL_ADD_LIBRARY (fltk_png SHARED "${PNG_SRCS}") FL_ADD_LIBRARY (fltk_png SHARED "${PNG_SRCS}")
target_link_libraries (fltk_png_SHARED fltk_z_SHARED) target_link_libraries (fltk_png_SHARED PUBLIC fltk_z_SHARED)
endif () endif ()