From 40a6c3c17272c8e4b45f14176898e269801be968 Mon Sep 17 00:00:00 2001 From: David Stoup Date: Fri, 10 Jul 2020 16:36:04 -0400 Subject: [PATCH] Update PNG to version 1.6.37 --- CMake/External_PNG.cmake | 6 +++--- CMake/fletch-tarballs.cmake | 13 +++---------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/CMake/External_PNG.cmake b/CMake/External_PNG.cmake index c63aaa22..65004cf4 100644 --- a/CMake/External_PNG.cmake +++ b/CMake/External_PNG.cmake @@ -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} diff --git a/CMake/fletch-tarballs.cmake b/CMake/fletch-tarballs.cmake index 7fb21f57..b9aea1ec 100644 --- a/CMake/fletch-tarballs.cmake +++ b/CMake/fletch-tarballs.cmake @@ -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