Mercurial > hg > orthanc-webviewer

changeset 239:fa67145e0278

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix Orthanc framework version
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 25 May 2020 11:59:59 +0200
parents aa230d13c442
children 40a433acf26a
files CMakeLists.txt Resources/Orthanc/DownloadOrthancFramework.cmake
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Thu May 21 09:43:31 2020 +0200
+++ b/CMakeLists.txt	Mon May 25 11:59:59 2020 +0200
@@ -24,8 +24,7 @@
 set(ORTHANC_PLUGIN_VERSION "mainline")
 
 if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline")
-  #set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.6.1")  # TODO - Must be set to "mainline" after 1.7.0
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.6.1")
--- a/Resources/Orthanc/DownloadOrthancFramework.cmake	Thu May 21 09:43:31 2020 +0200
+++ b/Resources/Orthanc/DownloadOrthancFramework.cmake	Mon May 25 11:59:59 2020 +0200
@@ -116,6 +116,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "eab428d6e53f61e847fa360bb17ebe25")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.6.1")
         set(ORTHANC_FRAMEWORK_MD5 "3971f5de96ba71dc9d3f3690afeaa7c0")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.0")
+        set(ORTHANC_FRAMEWORK_MD5 "ce5f689e852b01d3672bd3d2f952a5ef")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc