comparison Resources/CMake/LibPngConfiguration.cmake @ 2884:497a637366b4 db-changes

integration mainline->db-changes
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 12 Oct 2018 15:18:10 +0200
parents 74d0953a3681
children 0c2a8d5e0097
comparison
equal deleted inserted replaced
1762:2b91363cc1d1 2884:497a637366b4
1 if (STATIC_BUILD OR NOT USE_SYSTEM_LIBPNG) 1 if (STATIC_BUILD OR NOT USE_SYSTEM_LIBPNG)
2 SET(LIBPNG_SOURCES_DIR ${CMAKE_BINARY_DIR}/libpng-1.5.12) 2 SET(LIBPNG_SOURCES_DIR ${CMAKE_BINARY_DIR}/libpng-1.5.12)
3 SET(LIBPNG_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/libpng-1.5.12.tar.gz") 3 SET(LIBPNG_URL "http://www.orthanc-server.com/downloads/third-party/libpng-1.5.12.tar.gz")
4 SET(LIBPNG_MD5 "8ea7f60347a306c5faf70b977fa80e28") 4 SET(LIBPNG_MD5 "8ea7f60347a306c5faf70b977fa80e28")
5 5
6 DownloadPackage(${LIBPNG_MD5} ${LIBPNG_URL} "${LIBPNG_SOURCES_DIR}") 6 DownloadPackage(${LIBPNG_MD5} ${LIBPNG_URL} "${LIBPNG_SOURCES_DIR}")
7 7
8 include_directories( 8 include_directories(
44 # The following declaration avoids "__declspec(dllexport)" in 44 # The following declaration avoids "__declspec(dllexport)" in
45 # libpng to prevent publicly exposing its symbols by the DLLs 45 # libpng to prevent publicly exposing its symbols by the DLLs
46 -DPNG_IMPEXP= 46 -DPNG_IMPEXP=
47 ) 47 )
48 48
49 source_group(ThirdParty\\Libpng REGULAR_EXPRESSION ${LIBPNG_SOURCES_DIR}/.*) 49 source_group(ThirdParty\\libpng REGULAR_EXPRESSION ${LIBPNG_SOURCES_DIR}/.*)
50 50
51 else() 51 else()
52 include(FindPNG) 52 include(FindPNG)
53 53
54 if (NOT ${PNG_FOUND}) 54 if (NOT ${PNG_FOUND})