Mercurial > hg > orthanc-webviewer
diff Resources/CMake/GdcmConfiguration.cmake @ 177:8d1b1dc6150b
upgrade to GDCM 2.8.4 for static builds
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 04 Jan 2018 09:21:52 +0100 |
parents | 55f8cf4ea237 |
children | 993dd140bd30 |
line wrap: on
line diff
--- a/Resources/CMake/GdcmConfiguration.cmake Thu Jan 04 09:01:14 2018 +0100 +++ b/Resources/CMake/GdcmConfiguration.cmake Thu Jan 04 09:21:52 2018 +0100 @@ -47,13 +47,17 @@ list(APPEND Flags -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}) endif() + # Don't build manpages (since gdcm 2.8.4) + list(APPEND Flags -DGDCM_BUILD_DOCBOOK_MANPAGES=OFF) + if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") # Trick to disable the compilation of socket++ by gdcm, which is # incompatible with LSB, but fortunately only required for DICOM # Networking list(APPEND Flags -DGDCM_USE_SYSTEM_SOCKETXX=ON) - # Detect the number of CPU cores + # Detect the number of CPU cores to run "make" with as much + # parallelism as possible include(ProcessorCount) ProcessorCount(N) if (NOT N EQUAL 0) @@ -64,13 +68,13 @@ set(BUILD_COMMAND BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} ${MAKE_PARALLEL} gdcmMSFF gdcmcharls gdcmDICT gdcmDSED gdcmIOD gdcmjpeg8 - gdcmjpeg12 gdcmjpeg16 gdcmopenjpeg gdcmzlib gdcmCommon gdcmexpat) + gdcmjpeg12 gdcmjpeg16 gdcmopenjp2 gdcmzlib gdcmCommon gdcmexpat) endif() include(ExternalProject) externalproject_add(GDCM - URL "http://www.orthanc-server.com/downloads/third-party/gdcm-2.6.0.tar.gz" - URL_MD5 "978afe57af448b1c97c9f116790aca9c" + URL "http://www.orthanc-server.com/downloads/third-party/gdcm-2.8.4.tar.gz" + URL_MD5 "ce957b0bc1be4e8019162a10ca15432f" TIMEOUT 60 CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} ${Flags} ${BUILD_COMMAND} # Customize "make", only for Linux Standard Base (*) @@ -85,7 +89,8 @@ list(GET CMAKE_FIND_LIBRARY_PREFIXES 0 Prefix) endif() - set(GDCM_LIBRARIES + set(GDCM_LIBRARIES + # WARNING: The order of the libraries below *is* important! ${Prefix}gdcmMSFF${Suffix} ${Prefix}gdcmcharls${Suffix} ${Prefix}gdcmDICT${Suffix} @@ -94,7 +99,7 @@ ${Prefix}gdcmjpeg8${Suffix} ${Prefix}gdcmjpeg12${Suffix} ${Prefix}gdcmjpeg16${Suffix} - ${Prefix}gdcmopenjpeg${Suffix} + ${Prefix}gdcmopenjp2${Suffix} ${Prefix}gdcmzlib${Suffix} ${Prefix}gdcmCommon${Suffix} ${Prefix}gdcmexpat${Suffix}