Mercurial > hg > orthanc-wsi

changeset 251:01eb42ad1947

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
back to mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 11 Dec 2021 16:09:04 +0100
parents 8377dcef9a4b (current diff) e1bbf1031bc7 (diff)
children 918ff23bcd5f
files Resources/CMake/Version.cmake
diffstat 3 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Sat Dec 11 11:34:03 2021 +0100
+++ b/NEWS	Sat Dec 11 16:09:04 2021 +0100
@@ -1,6 +1,9 @@
 Pending changes in the mainline
 ===============================
 
+Version 1.1 (2021-12-11)
+========================
+
 * OrthancWSIDicomizer: Support importing of images from Cytomine
 
 
--- a/Resources/CMake/Version.cmake	Sat Dec 11 11:34:03 2021 +0100
+++ b/Resources/CMake/Version.cmake	Sat Dec 11 16:09:04 2021 +0100
@@ -21,10 +21,10 @@
 set(ORTHANC_WSI_VERSION "mainline")
 
 if (ORTHANC_WSI_VERSION STREQUAL "mainline")
-  set(ORTHANC_FRAMEWORK_VERSION "mainline")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_VERSION "ae0e3fd609df")  # Framework pre-1.9.8
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "b2e08d83e21d")  # Framework pre-1.9.8
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
@@ -32,6 +32,7 @@
   -DORTHANC_WSI_VERSION="${ORTHANC_WSI_VERSION}"
   )
 
+set(ORTHANC_FRAMEWORK_VERSION "${ORTHANC_FRAMEWORK_DEFAULT_VERSION}" CACHE STRING "Version of the Orthanc framework")
 set(ORTHANC_FRAMEWORK_SOURCE "${ORTHANC_FRAMEWORK_DEFAULT_SOURCE}" CACHE STRING "Source of the Orthanc source code (can be \"hg\", \"archive\", \"web\" or \"path\")")
 set(ORTHANC_FRAMEWORK_ARCHIVE "" CACHE STRING "Path to the Orthanc archive, if ORTHANC_FRAMEWORK_SOURCE is \"archive\"")
 set(ORTHANC_FRAMEWORK_ROOT "" CACHE STRING "Path to the Orthanc source directory, if ORTHANC_FRAMEWORK_SOURCE is \"path\"")
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Sat Dec 11 11:34:03 2021 +0100
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Sat Dec 11 16:09:04 2021 +0100
@@ -72,7 +72,10 @@
       if (NOT ORTHANC_FRAMEWORK_MAJOR MATCHES "^[0-9]+$" OR
           NOT ORTHANC_FRAMEWORK_MINOR MATCHES "^[0-9]+$" OR
           NOT ORTHANC_FRAMEWORK_REVISION MATCHES "^[0-9]+$")
-        message("Bad version of the Orthanc framework: ${ORTHANC_FRAMEWORK_VERSION}")
+        message("Bad version of the Orthanc framework, assuming a pre-release: ${ORTHANC_FRAMEWORK_VERSION}")
+        set(ORTHANC_FRAMEWORK_MAJOR 999)
+        set(ORTHANC_FRAMEWORK_MINOR 999)
+        set(ORTHANC_FRAMEWORK_REVISION 999)
       endif()
 
       if (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.3.1")
@@ -159,9 +162,9 @@
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "23ad1b9c7800")
         # For "Toolbox::ReadJson()" and "Toolbox::Write{...}Json()" (pre-1.9.0)
         set(ORTHANC_FRAMEWORK_MD5 "9af92080e57c60dd288eba46ce606c00")
-      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "ae0e3fd609df")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "b2e08d83e21d")
         # WSI 1.1 (framework pre-1.9.8), to remove "-std=c++11"
-        set(ORTHANC_FRAMEWORK_MD5 "7a54f4ebb5b78614f987cf5e6e7b233c")
+        set(ORTHANC_FRAMEWORK_MD5 "2eaa073cbb4b44ffba199ad93393b2b1")
       endif()
     endif()
   endif()