# HG changeset patch # User Sebastien Jodogne # Date 1571229186 -7200 # Node ID 25126912aa2cfa03ab3b19f89eec364ccd0e11f8 # Parent 096c827cbf9e4b8e189a0b05af3c5d575826a92a# Parent 4beabcea3a5cb79506ca1f9cd28d6a6b8c7b7f03 back to mainline diff -r 4beabcea3a5c -r 25126912aa2c Resources/CMake/OrthancFrameworkParameters.cmake --- a/Resources/CMake/OrthancFrameworkParameters.cmake Wed Oct 16 12:52:25 2019 +0200 +++ b/Resources/CMake/OrthancFrameworkParameters.cmake Wed Oct 16 14:33:06 2019 +0200 @@ -3,7 +3,7 @@ ##################################################################### # Version of the build, should always be "mainline" except in release branches -set(ORTHANC_VERSION "1.5.8") +set(ORTHANC_VERSION "mainline") # Version of the database schema. History: # * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning diff -r 4beabcea3a5c -r 25126912aa2c Resources/DownloadOrthancFramework.cmake --- a/Resources/DownloadOrthancFramework.cmake Wed Oct 16 12:52:25 2019 +0200 +++ b/Resources/DownloadOrthancFramework.cmake Wed Oct 16 14:33:06 2019 +0200 @@ -110,6 +110,8 @@ set(ORTHANC_FRAMEWORK_MD5 "3c29de1e289b5472342947168f0105c0") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.7") set(ORTHANC_FRAMEWORK_MD5 "e1b76f01116d9b5d4ac8cc39980560e3") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.8") + set(ORTHANC_FRAMEWORK_MD5 "82323e8c49a667f658a3639ea4dbc336") endif() endif() endif()