Skip to content
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.

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

Update PNG to version 1.6.37 #596

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions CMake/External_PNG.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ ExternalProject_Add(PNG
URL_MD5 ${PNG_md5}
${COMMON_EP_ARGS}
${COMMON_CMAKE_EP_ARGS}
PATCH_COMMAND ${CMAKE_COMMAND} -E copy
${fletch_SOURCE_DIR}/Patches/PNG/CMakeLists.txt
${fletch_BUILD_PREFIX}/src/PNG/CMakeLists.txt
# PATCH_COMMAND ${CMAKE_COMMAND} -E copy
# ${fletch_SOURCE_DIR}/Patches/PNG/CMakeLists.txt
# ${fletch_BUILD_PREFIX}/src/PNG/CMakeLists.txt
CMAKE_ARGS
${COMMON_CMAKE_ARGS}
${png_cmake_args}
Expand Down
13 changes: 3 additions & 10 deletions CMake/fletch-tarballs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,10 @@ list(APPEND fletch_external_sources libtiff)
# PNG
set(PNG_version_major 1)
set(PNG_version_minor 6)
set(PNG_version_patch 19)
set(PNG_version_patch 37)
set(PNG_version "${PNG_version_major}.${PNG_version_minor}.${PNG_version_patch}")
set(PNG_major_minor_no_dot "${PNG_version_major}${PNG_version_minor}")
set(PNG_version_no_dot "${PNG_major_minor_no_dot}${PNG_version_patch}")
if(WIN32)
set(PNG_url "http://sourceforge.net/projects/libpng/files/libpng${PNG_major_minor_no_dot}/older-releases/${PNG_version}/lpng${PNG_major_minor_no_dot}${PNG_version_patch}.zip")
set(PNG_md5 "ff0e82b4d8516daa7ed6b1bf93acca48")
else()
set(PNG_url "http://sourceforge.net/projects/libpng/files/libpng${PNG_major_minor_no_dot}/older-releases/${PNG_version}/libpng-${PNG_version}.tar.gz")
set(PNG_md5 "3121bdc77c365a87e054b9f859f421fe")
endif()
set(PNG_url "https://sourceforge.net/projects/libpng/files/libpng16/${PNG_version}/libpng-${PNG_version}.tar.gz")
set(PNG_md5 "6c7519f6c75939efa0ed3053197abd54")
list(APPEND fletch_external_sources PNG)

# openjpeg
Expand Down