diff Resources/CMake/LibPngConfiguration.cmake @ 3285:3f7d4b735f95

upgrade to libpng 1.6.36
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 21 Feb 2019 18:15:05 +0100
parents 0c2a8d5e0097
children
line wrap: on
line diff
--- a/Resources/CMake/LibPngConfiguration.cmake	Thu Feb 21 18:04:10 2019 +0100
+++ b/Resources/CMake/LibPngConfiguration.cmake	Thu Feb 21 18:15:05 2019 +0100
@@ -1,7 +1,7 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_LIBPNG)
-  SET(LIBPNG_SOURCES_DIR ${CMAKE_BINARY_DIR}/libpng-1.5.12)
-  SET(LIBPNG_URL "http://orthanc.osimis.io/ThirdPartyDownloads/libpng-1.5.12.tar.gz")
-  SET(LIBPNG_MD5 "8ea7f60347a306c5faf70b977fa80e28")
+  SET(LIBPNG_SOURCES_DIR ${CMAKE_BINARY_DIR}/libpng-1.6.36)
+  SET(LIBPNG_URL "http://orthanc.osimis.io/ThirdPartyDownloads/libpng-1.6.36.tar.gz")
+  SET(LIBPNG_MD5 "65afdeaa05f5ec14e31d9276143012e9")
 
   DownloadPackage(${LIBPNG_MD5} ${LIBPNG_URL} "${LIBPNG_SOURCES_DIR}")
 
@@ -34,11 +34,8 @@
     ${LIBPNG_SOURCES_DIR}/pngwutil.c
     )
 
-  #set_property(
-  #  SOURCE ${LIBPNG_SOURCES}
-  #  PROPERTY COMPILE_FLAGS -UHAVE_CONFIG_H)
-
   add_definitions(
+    -DPNG_NO_CONFIG_H=1
     -DPNG_NO_CONSOLE_IO=1
     -DPNG_NO_STDIO=1
     # The following declaration avoids "__declspec(dllexport)" in