Mercurial > hg > orthanc-gdcm

changeset 43:ff44174ede8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upgrade to GDCM 3.0.8 for static builds
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 17 Dec 2020 16:48:55 +0100
parents 962307b99548
children ad9c32ea9eac d16068d62a3b
files NEWS Resources/CMake/GdcmConfiguration.cmake Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
diffstat 3 files changed, 21 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Thu Dec 03 13:55:51 2020 +0100
+++ b/NEWS	Thu Dec 17 16:48:55 2020 +0100
@@ -2,6 +2,7 @@
 ===============================
 
 * Temporarily prevent transcoding of 16bpp images to JPEG, as this might crash GDCM
+* Upgrade to GDCM 3.0.8 for static builds
 
 
 Version 1.1 (2020-08-05)
--- a/Resources/CMake/GdcmConfiguration.cmake	Thu Dec 03 13:55:51 2020 +0100
+++ b/Resources/CMake/GdcmConfiguration.cmake	Thu Dec 17 16:48:55 2020 +0100
@@ -22,8 +22,8 @@
     set(GDCM_URL "http://orthanc.osimis.io/ThirdPartyDownloads/gdcm-2.8.9.tar.gz")
     set(GDCM_MD5 "aeb00e0cb5375d454010a72e2e0f6154")
   else()
-    set(GDCM_URL "http://orthanc.osimis.io/ThirdPartyDownloads/gdcm-3.0.7.tar.gz")
-    set(GDCM_MD5 "ecfaa66b03c4d3773209f33000c243c6")
+    set(GDCM_URL "http://orthanc.osimis.io/ThirdPartyDownloads/gdcm-3.0.8.tar.gz")
+    set(GDCM_MD5 "29e0e60b04183e3eb9c18ad093156b2c")
   endif()
   
   if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Thu Dec 03 13:55:51 2020 +0100
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Thu Dec 17 16:48:55 2020 +0100
@@ -118,6 +118,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "19fcb7c21876af86546baa048a22c6c0")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.0")
         set(ORTHANC_FRAMEWORK_MD5 "f8ec7554ef5d23ea4ce474b1e8214de9")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.1")
+        set(ORTHANC_FRAMEWORK_MD5 "db094f96399cbe8b9bbdbce34884c220")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
@@ -129,6 +131,12 @@
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "ae0e3fd609df")
         # DICOMweb 1.1 (framework pre-1.6.0)
         set(ORTHANC_FRAMEWORK_MD5 "7e09e9b530a2f527854f0b782d7e0645")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "82652c5fc04f")
+        # Stone Web viewer 1.0 (framework pre-1.8.1)
+        set(ORTHANC_FRAMEWORK_MD5 "d77331d68917e66a3f4f9b807bbdab7f")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "4a3ba4bf4ba7")
+        # PostgreSQL 3.3 (framework pre-1.8.2)
+        set(ORTHANC_FRAMEWORK_MD5 "2d82bddf06f9cfe82095495cb3b8abde")
       endif()
     endif()
   endif()
@@ -524,6 +532,16 @@
       include_directories(${DCMTK_INCLUDE_DIRS})
       link_libraries(${DCMTK_LIBRARIES})
     endif()
+
+    # Optional component - OpenSSL
+    if (ENABLE_SSL)
+      include(FindOpenSSL)
+      if (NOT ${OPENSSL_FOUND})
+        message(FATAL_ERROR "Unable to find OpenSSL")
+      endif()
+      include_directories(${OPENSSL_INCLUDE_DIR})
+      link_libraries(${OPENSSL_LIBRARIES})
+    endif()
   endif()
 
   # Look for Orthanc framework shared library