# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1602839545 -7200
# Node ID 2d6e7471ec7fc8dfa1207803162f8c4dfb04f007
# Parent  2221051b42df50bc366019c2c384c8edb9b16691# Parent  a4af6eaca23ecabf108f1f00cdc28d7fb0ad2346
back to mainline

diff -r a4af6eaca23e -r 2d6e7471ec7f OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake
--- a/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Thu Oct 15 22:00:07 2020 +0200
+++ b/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Fri Oct 16 11:12:25 2020 +0200
@@ -116,6 +116,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "3f1ba9502ec7c5449971d3b56087bcde")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.4")
         set(ORTHANC_FRAMEWORK_MD5 "19fcb7c21876af86546baa048a22c6c0")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.0")
+        set(ORTHANC_FRAMEWORK_MD5 "f8ec7554ef5d23ea4ce474b1e8214de9")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
diff -r a4af6eaca23e -r 2d6e7471ec7f OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Thu Oct 15 22:00:07 2020 +0200
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Fri Oct 16 11:12:25 2020 +0200
@@ -23,7 +23,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "1.8.0")
+set(ORTHANC_VERSION "mainline")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning